diff --git a/.gitea/workflows/build_and_test.yml b/.gitea/workflows/build_and_test.yml
index 0982ec085..e379a75a5 100644
--- a/.gitea/workflows/build_and_test.yml
+++ b/.gitea/workflows/build_and_test.yml
@@ -28,9 +28,8 @@ on:
   push:
     branches:
       - '**'
-    tags:
-      - '**'
-  pull_request:
+  # No pull_request trigger: branches live in this repository, so the push above has already run
+  # the whole workflow on the very same commit. Adding the PR event only ran it a second time.
   workflow_dispatch:
     inputs:
       create_release:
@@ -43,13 +42,8 @@ jobs:
   unit-tests:
     name: Unit tests
     runs-on: jfjoch_rocky8
-    # Not on a tag, on purpose. Releasing is a two-step dance because artifacts do not carry between
-    # runs: the manual dispatch below runs the whole CI (this job included) and then creates the tag,
-    # and the tag push re-runs the workflow only to rebuild and upload. The tag run has therefore
-    # already been tested by the dispatch run it came from.
-    if: github.ref_type != 'tag'
     container:
-      image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2511
+      image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2609
       options: --gpus all
     timeout-minutes: 90
     env:
@@ -72,7 +66,7 @@ jobs:
           mkdir -p build
           cd build
           cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.LINUX_CMAKE_FLAGS }} ..
-          ninja -j48 jfjoch_test jfjoch_hdf5_test jfjoch_hdf5_enospc_test enospc_shim
+          ninja -j16 jfjoch_test jfjoch_hdf5_test jfjoch_hdf5_enospc_test enospc_shim
       - name: Run unit tests
         shell: bash
         run: |
@@ -91,6 +85,8 @@ jobs:
           ./jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5
   build-windows:
     name: build:windows:${{ matrix.variant }}
+    # Uploads to the release, so it waits for the job that creates it.
+    needs: create-release
     runs-on: windows-11-cuda-qt
     timeout-minutes: 120
     strategy:
@@ -123,7 +119,7 @@ jobs:
           cd build
           cpack
       - name: Upload installer to release
-        if: github.ref_type == 'tag'
+        if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
         shell: powershell
         env:
           TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }}
@@ -137,7 +133,11 @@ jobs:
           }
   build-viewer-tgz:
     name: build:viewer-tgz:${{ matrix.variant }}
+    # Uploads to the release, so it waits for the job that creates it.
+    needs: create-release
     runs-on: jfjoch_rocky8
+    container:
+      image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2609
     timeout-minutes: 120
     strategy:
       fail-fast: false
@@ -169,7 +169,7 @@ jobs:
           ninja -j16
           cpack
       - name: Upload viewer tgz to release
-        if: github.ref_type == 'tag'
+        if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
         shell: bash
         env:
           TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }}
@@ -190,7 +190,11 @@ jobs:
           done
   build-rugnux-tgz:
     name: build:rugnux-tgz (x86_64)
+    # Uploads to the release, so it waits for the job that creates it.
+    needs: create-release
     runs-on: jfjoch_rocky8
+    container:
+      image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2609
     timeout-minutes: 120
     steps:
       - uses: actions/checkout@v4
@@ -222,7 +226,7 @@ jobs:
           if [ -s /tmp/rgx.cufft ]; then echo "a libcufft is shipped in the tarball"; exit 1; fi
           echo "self-contained: static cuFFT, nothing to ship beside it"
       - name: Upload rugnux tgz to release
-        if: github.ref_type == 'tag'
+        if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
         shell: bash
         env:
           TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }}
@@ -244,14 +248,16 @@ jobs:
 
   build-rugnux-windows:
     name: build:rugnux:windows
+    # Uploads to the release, so it waits for the job that creates it.
+    needs: create-release
     runs-on: windows-11-cuda-qt
     timeout-minutes: 120
     steps:
       - uses: actions/checkout@v4
       # cmd, not bash: the Windows runner has no bash, and every cmake invocation needs the MSVC
       # environment from vcvars64.bat first -- same shape as build-windows above. No Qt in
-      # CMAKE_PREFIX_PATH: JFJOCH_RUGNUX_ONLY is the portable subtree minus viewer/, so C:/deps
-      # (Eigen, ZLIB) is all it needs.
+      # CMAKE_PREFIX_PATH: JFJOCH_RUGNUX_ONLY is the portable subtree minus viewer/, and every
+      # library it needs is now fetched and built by the configure, so C:/deps is only a leftover.
       - name: Configure rugnux build
         shell: cmd
         run: |
@@ -272,7 +278,7 @@ jobs:
           cd build-rugnux
           cpack
       - name: Upload rugnux zip to release
-        if: github.ref_type == 'tag'
+        if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
         shell: powershell
         env:
           TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }}
@@ -287,6 +293,8 @@ jobs:
 
   build-rugnux-arm:
     name: build:rugnux:aarch64 (cross)
+    # Uploads to the release, so it waits for the job that creates it.
+    needs: create-release
     # Cross-compiled on an x86_64 runner: nvcc, gcc and cmake all run native and only emit aarch64,
     # so this costs about what a normal build costs. Uses the ordinary ubuntu2404 image, which now
     # also carries the aarch64 toolchain and the CUDA sbsa cross tree.
@@ -296,7 +304,7 @@ jobs:
     # rebuilding and re-pushing the image, and a fix to it would appear to have no effect.
     runs-on: jfjoch_ubuntu2404
     container:
-      image: gitea.psi.ch/leonarski_f/jfjoch_ubuntu2404:2508
+      image: gitea.psi.ch/leonarski_f/jfjoch_ubuntu2404:2609
     steps:
       - uses: actions/checkout@v4
       - name: Clean previous build
@@ -347,7 +355,7 @@ jobs:
           done
           echo "aarch64, self-contained, both GPU targets present"
       - name: Upload tarball to release
-        if: github.ref_type == 'tag'
+        if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
         shell: bash
         env:
           TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }}
@@ -367,57 +375,71 @@ jobs:
 
   build-rpm:
     name: build:rpm (${{ matrix.distro }})
+    # Uploads to the release, so it waits for the job that creates it.
+    needs: create-release
     runs-on: ${{ matrix.runner }}
+    container:
+      image: ${{ matrix.image }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - runner: jfjoch_rocky8
+            image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2609
             distro: rocky8
             cmake_flags: -DJFJOCH_USE_CUDA=ON
             pkg_glob: "*.rpm"
             upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el8/slsdet8-cuda12/upload
           - runner: jfjoch_rocky8
+            image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2609
             distro: rocky8_sls9
             cmake_flags: -DJFJOCH_USE_CUDA=ON -DSLS9=ON
             pkg_glob: "*.rpm"
             upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el8/slsdet9-cuda12/upload
           - runner: jfjoch_rocky8
+            image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2609
             distro: rocky8_nocuda
             cmake_flags: -DJFJOCH_USE_CUDA=OFF
             pkg_glob: "*.rpm"
             upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el8/slsdet8-nocuda/upload
           - runner: jfjoch_rocky9
+            image: gitea.psi.ch/leonarski_f/jfjoch_rocky9:2609
             distro: rocky9
             cmake_flags: -DJFJOCH_USE_CUDA=ON
             pkg_glob: "*.rpm"
             upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el9/slsdet8-cuda13/upload
           - runner: jfjoch_rocky9
+            image: gitea.psi.ch/leonarski_f/jfjoch_rocky9:2609
             distro: rocky9_sls9
             cmake_flags: -DJFJOCH_USE_CUDA=ON -DSLS9=ON
             pkg_glob: "*.rpm"
             upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el9/slsdet9-cuda13/upload
           - runner: jfjoch_rocky9
+            image: gitea.psi.ch/leonarski_f/jfjoch_rocky9:2609
             distro: rocky9_nocuda
             cmake_flags: -DJFJOCH_USE_CUDA=OFF
             pkg_glob: "*.rpm"
             upload_url: https://gitea.psi.ch/api/packages/mx/rpm/centos/el9/slsdet8-nocuda/upload
           - runner: jfjoch_ubuntu2204
+            image: gitea.psi.ch/leonarski_f/jfjoch_ubuntu2204:2609
             distro: ubuntu2204
             cmake_flags: -DJFJOCH_USE_CUDA=ON
             pkg_glob: "*.deb"
             upload_url: https://gitea.psi.ch/api/packages/mx/debian/pool/jammy/cuda13/upload
           - runner: jfjoch_ubuntu2204
+            image: gitea.psi.ch/leonarski_f/jfjoch_ubuntu2204:2609
             distro: ubuntu2204_nocuda
             cmake_flags: -DJFJOCH_USE_CUDA=OFF
             pkg_glob: "*.deb"
             upload_url: https://gitea.psi.ch/api/packages/mx/debian/pool/jammy/nocuda/upload
           - runner: jfjoch_ubuntu2404
+            image: gitea.psi.ch/leonarski_f/jfjoch_ubuntu2404:2609
             distro: ubuntu2404
             cmake_flags: -DJFJOCH_USE_CUDA=ON
             pkg_glob: "*.deb"
             upload_url: https://gitea.psi.ch/api/packages/mx/debian/pool/noble/cuda13/upload
           - runner: jfjoch_ubuntu2404
+            image: gitea.psi.ch/leonarski_f/jfjoch_ubuntu2404:2609
             distro: ubuntu2404_nocuda
             cmake_flags: -DJFJOCH_USE_CUDA=OFF
             pkg_glob: "*.deb"
@@ -441,7 +463,7 @@ jobs:
           ninja frontend
           ninja -j16 package
       - name: Upload packages
-        if: github.ref_type == 'tag'
+        if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
         shell: bash
         env:
           TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }}
@@ -481,9 +503,11 @@ jobs:
                  python3 gitea_upload_file.py "$file"
             done
           fi
-  dials-test:
-    name: DIALS test
+  hdf5-consumer-tests:
+    name: HDF5 consumer tests (DIALS, XDS)
     runs-on: jfjoch_rocky9
+    container:
+      image: gitea.psi.ch/leonarski_f/jfjoch_rocky9:2609
     steps:
       - uses: actions/checkout@v4
       - name: Build processing test
@@ -492,177 +516,125 @@ jobs:
           mkdir -p build
           cd build
           cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.LINUX_CMAKE_FLAGS }} ..
-          ninja -j16 jfjoch_hdf5_test
-      # dials.import before xia2.ssx, checking the image COUNT: dxtbx reports a short scan rather
-      # than failing when it cannot reach every image, and xia2.ssx still succeeds on the images it
-      # did get, so an exit code alone does not notice. Multi-file NXmxLegacy is exercised by the
-      # XDS jobs below but deliberately not here: dxtbx reads only the first data file of a legacy
-      # master (it takes one dataset out of NXdata and indexes it globally), so that combination
-      # cannot pass until the limitation is fixed upstream.
-      - name: Run DIALS processing on legacy format
+          ninja -j16 jfjoch_hdf5_test jfjoch_xds_plugin
+      # One job for what used to be four, each of which configured and built the same
+      # jfjoch_hdf5_test on the same image. Every case still runs when an earlier one fails -- each
+      # is a subshell under `set -e`, so a case stops at its own first bad command without taking
+      # the rest down -- and the summary at the end decides the job's result.
+      - name: Run every consumer against every file layout
         shell: bash
         run: |
-          source /opt/dials-v3-27-0/dials_env.sh
-          mkdir -p test01
-          cd test01
-          ../build/tools/jfjoch_hdf5_test ../tests/test_data/compression_benchmark.h5 -n100 -o legacy
-          dials.import legacy_master.h5 | tee import.log
-          grep -q "num images: 100" import.log || { echo "DIALS did not read all 100 images"; exit 1; }
-          xia2.ssx image=legacy_master.h5 space_group=P43212 unit_cell=78.551,78.551,36.914,90.000,90.000,90.000
-      - name: Run DIALS processing on VDS (master + 4 linked image files)
-        shell: bash
-        run: |
-          source /opt/dials-v3-27-0/dials_env.sh
-          mkdir -p test02
-          cd test02
-          ../build/tools/jfjoch_hdf5_test ../tests/test_data/compression_benchmark.h5 -n100 -f25 -V -o vds
-          dials.import vds_master.h5 | tee import.log
-          grep -q "num images: 100" import.log || { echo "DIALS did not read all 100 images"; exit 1; }
-          xia2.ssx image=vds_master.h5 space_group=P43212 unit_cell=78.551,78.551,36.914,90.000,90.000,90.000
-      - name: Run DIALS processing on single file format
-        shell: bash
-        run: |
-          source /opt/dials-v3-27-0/dials_env.sh
-          mkdir -p test03
-          cd test03
+          cd "$GITHUB_WORKSPACE"
+          HDF5_TEST=$PWD/build/tools/jfjoch_hdf5_test
+          DATA=$PWD/tests/test_data/compression_benchmark.h5
+          # Unquoted on use: these are two arguments, not one.
+          CELL="space_group=P43212 unit_cell=78.551,78.551,36.914,90.000,90.000,90.000"
+
+          # -- DIALS -------------------------------------------------------------------------
+          # dials.import before xia2.ssx, checking the image COUNT: dxtbx reports a short scan
+          # rather than failing when it cannot reach every image, and xia2.ssx still succeeds on
+          # the images it did get, so an exit code alone does not notice. Multi-file NXmxLegacy is
+          # exercised by the XDS cases below but deliberately not here: dxtbx reads only the first
+          # data file of a legacy master (it takes one dataset out of NXdata and indexes it
+          # globally), so that combination cannot pass until the limitation is fixed upstream.
+          dials_case() { # <dir> <prefix> <jfjoch_hdf5_test flags...>
+            local dir=$1 prefix=$2; shift 2
+            source /opt/dials-v3-27-0/dials_env.sh
+            rm -rf "$dir"; mkdir -p "$dir"; cd "$dir"
+            "$HDF5_TEST" "$DATA" "$@" -o "$prefix"
+            dials.import "${prefix}_master.h5" | tee import.log
+            grep -q "num images: 100" import.log || { echo "DIALS did not read all 100 images"; return 1; }
+            xia2.ssx image="${prefix}_master.h5" $CELL
+          }
+          dials_legacy() { dials_case test01 legacy -n100; }
+          dials_vds()    { dials_case test02 vds    -n100 -f25 -V; }
           # -S writes <prefix>_master.h5, not <prefix>.h5 - naming this wrong meant xia2.ssx was
           # pointed at a file that never existed, so the integrated format went untested.
-          ../build/tools/jfjoch_hdf5_test ../tests/test_data/compression_benchmark.h5 -n100 -S -o single
-          dials.import single_master.h5 | tee import.log
-          grep -q "num images: 100" import.log || { echo "DIALS did not read all 100 images"; exit 1; }
-          xia2.ssx image=single_master.h5 space_group=P43212 unit_cell=78.551,78.551,36.914,90.000,90.000,90.000
-      # Everything above writes an UNTILTED detector, where every plausible encoding of the tilt
-      # agrees exactly - so none of it constrains the NXmx transformation chain. This does.
-      - name: Check tilted detector geometry against DIALS
-        shell: bash
-        run: |
-          source /opt/dials-v3-27-0/dials_env.sh
-          mkdir -p test04
-          cd test04
-          ../build/tools/jfjoch_hdf5_test ../tests/test_data/compression_benchmark.h5 -n1 -S -o geom
-          dials.python ../tests/nxmx_geometry_dials_test.py geom_master.h5
-  xds-durin-test:
-    name: XDS test (durin plugin)
-    runs-on: jfjoch_rocky9
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build processing test
-        shell: bash
-        run: |
-          mkdir -p build
-          cd build
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.LINUX_CMAKE_FLAGS }} ..
-          ninja -j16 jfjoch_hdf5_test
-      - name: Run XDS with Durin and legacy HDF5 format
-        shell: bash
-        run: |
-          cd tests/xds_durin
-          rm -rf *.h5 *.LP *.HKL
-          ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -f10
-          /opt/xds/xds_par
-          test -f IDXREF.LP
-      - name: Run XDS with Durin and VDS HDF5 format
-        shell: bash
-        run: |
-          cd tests/xds_durin
-          rm -rf *.h5 *.LP *.HKL
-          ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -f10 -V
-          /opt/xds/xds_par
-          test -f IDXREF.LP
-      - name: Run XDS with Durin and integrated HDF5 format
-        shell: bash
-        run: |
-          cd tests/xds_durin
-          rm -rf *.h5 *.LP *.HKL
-          ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -S
-          /opt/xds/xds_par
-          test -f IDXREF.LP
-  xds-test:
-    name: XDS test (JFJoch plugin)
-    runs-on: jfjoch_rocky9
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build processing test
-        shell: bash
-        run: |
-          mkdir -p build
-          cd build
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.LINUX_CMAKE_FLAGS }} ..
-          ninja -j16 jfjoch_hdf5_test 
-          ninja -j16 jfjoch_xds_plugin
-      - name: Run XDS with legacy HDF5 format
-        shell: bash
-        run: |
-          cd tests/xds
-          ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -f10
-          /opt/xds/xds_par
-          test -f IDXREF.LP
-      - name: Run XDS with VDS HDF5 format
-        shell: bash
-        run: |
-          cd tests/xds
-          rm -f *.h5 *.LP *.HKL
-          ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -f10 -V
-          /opt/xds/xds_par
-          test -f IDXREF.LP
-      - name: Run XDS with single HDF5 format
-        shell: bash
-        run: |
-          cd tests/xds
-          rm -f *.h5 *.LP *.HKL
-          ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -S
-          /opt/xds/xds_par
-          test -f IDXREF.LP
-  xds-neggia-test:
-    name: XDS test (neggia plugin)
-    runs-on: jfjoch_rocky9
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build processing test
-        shell: bash
-        run: |
-          mkdir -p build
-          cd build
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ env.LINUX_CMAKE_FLAGS }} ..
-          ninja -j16 jfjoch_hdf5_test
-      - name: Run XDS with Neggia and legacy HDF5 format
-        shell: bash
-        run: |
-          cd tests/xds_neggia
-          ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -f10
-          /opt/xds/xds_par
-          test -f IDXREF.LP
-      - name: Run XDS with Neggia and single HDF5 format
-        shell: bash
-        run: |
-          cd tests/xds_neggia
-          rm -f *.h5 *.LP *.HKL
-          ../../build/tools/jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 -n25 -S
-          /opt/xds/xds_par
-          test -f IDXREF.LP
+          dials_single() { dials_case test03 single -n100 -S; }
+          # Everything above writes an UNTILTED detector, where every plausible encoding of the tilt
+          # agrees exactly - so none of it constrains the NXmx transformation chain. This does.
+          dials_tilted() {
+            source /opt/dials-v3-27-0/dials_env.sh
+            rm -rf test04; mkdir -p test04; cd test04
+            "$HDF5_TEST" "$DATA" -n1 -S -o geom
+            dials.python "$GITHUB_WORKSPACE/tests/nxmx_geometry_dials_test.py" geom_master.h5
+          }
+
+          # -- XDS, once per read plugin -----------------------------------------------------
+          # Each case clears its directory first. The runner reuses the workspace volume, so a
+          # leftover .h5/.LP from an earlier run could let XDS "pass" on files this case never
+          # wrote -- which is what the first case of two of these jobs used to risk.
+          xds_case() { # <dir> <jfjoch_hdf5_test flags...>
+            local dir=$1; shift
+            cd "tests/$dir"
+            rm -f ./*.h5 ./*.LP ./*.HKL
+            "$HDF5_TEST" "$DATA" "$@"
+            /opt/xds/xds_par
+            test -f IDXREF.LP
+          }
+          durin_legacy()  { xds_case xds_durin  -n25 -f10;    }
+          durin_vds()     { xds_case xds_durin  -n25 -f10 -V; }
+          durin_single()  { xds_case xds_durin  -n25 -S;      }
+          jfjoch_legacy() { xds_case xds        -n25 -f10;    }
+          jfjoch_vds()    { xds_case xds        -n25 -f10 -V; }
+          jfjoch_single() { xds_case xds        -n25 -S;      }
+          # Neggia cannot read a VDS master, so it gets the two layouts it supports.
+          neggia_legacy() { xds_case xds_neggia -n25 -f10;    }
+          neggia_single() { xds_case xds_neggia -n25 -S;      }
+
+          fail=0
+          summary=""
+          for t in dials_legacy dials_vds dials_single dials_tilted \
+                   durin_legacy durin_vds durin_single \
+                   jfjoch_legacy jfjoch_vds jfjoch_single \
+                   neggia_legacy neggia_single; do
+            echo "::group::$t"
+            # Run the subshell as a command of its own and test $? afterwards. A subshell used
+            # directly as an `if` condition has its `set -e` ignored, so the case would carry on
+            # past its first failure and report only the last command's status.
+            ( set -e; cd "$GITHUB_WORKSPACE"; "$t" )
+            rc=$?
+            if [ "$rc" -eq 0 ]; then
+              summary="$summary  PASS  $t"$'\n'
+            else
+              summary="$summary  FAIL  $t (exit $rc)"$'\n'; fail=1
+            fi
+            echo "::endgroup::"
+          done
+          echo "===== HDF5 consumer tests ====="
+          printf '%s' "$summary"
+          exit "$fail"
   python-client:
     name: Generate python client
+    # Uploads to the release, so it waits for the job that creates it.
+    needs: create-release
     runs-on: jfjoch_rocky8
+    container:
+      image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2609
     steps:
       - uses: actions/checkout@v4
       - name: Build python client
         shell: bash
         run: bash gen_python_client.sh
       - name: Upload Package to Gitea PyPI
-        if: github.ref_type == 'tag'
+        if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
         run: |
           twine upload -u __token__ -p ${{ secrets.CI_PYPI_TOKEN }} --skip-existing dist/*
           twine upload -u __token__ -p ${{ secrets.PIP_REPOSITORY_API_TOKEN }} --repository-url https://gitea.psi.ch/api/packages/mx/pypi dist/*
   documentation:
     name: Build documentation
+    # Uploads to the release, so it waits for the job that creates it.
+    needs: create-release
     runs-on: jfjoch_rocky8
+    container:
+      image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2609
     steps:
       - uses: actions/checkout@v4
       - name: Build documentation
         shell: bash
         run: bash make_doc.sh
       - name: Upload documentation
-        if: github.ref_type == 'tag'
+        if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
         shell: bash
         run: |
           git config --global user.email "filip.leonarski@psi.ch"
@@ -679,15 +651,22 @@ jobs:
           git add .
           git commit -m "Deploy site"
           git push -f https://${{secrets.GITHUB_TOKEN}}@gitea.psi.ch/${{ github.repository }}.git gitea-pages
+  # Runs on every event, but only creates something when asked. Keeping it unconditional is what
+  # lets every other job depend on it with a plain `needs:` -- a skipped dependency would otherwise
+  # skip its dependents too. When it creates nothing it is just a checkout.
   create-release:
     name: Create release
     runs-on: jfjoch_rocky8
-    if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
+    container:
+      image: gitea.psi.ch/leonarski_f/jfjoch_rocky8:2609
     steps:
       - uses: actions/checkout@v4
         with:
           persist-credentials: 'true' # Optional; should be the default
+      # The LFS objects are pulled only to attach the FPGA images below, so this stays off the
+      # critical path of an ordinary push -- where this job is a bare checkout and nothing else.
       - name: Configure auth and fetch LFS
+        if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
         shell: bash
         env:
           GITEA_TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }}
@@ -698,6 +677,7 @@ jobs:
           git config --local http.${{ github.server_url }}/${{ github.repository }}.git/info/lfs/objects/batch.extraheader "$AUTH"
           git lfs pull
       - name: Create release
+        if: github.event_name == 'workflow_dispatch' && (github.event.inputs.create_release == 'true' || github.event.inputs.create_release == true)
         env:
           TOKEN: ${{ secrets.PIP_REPOSITORY_API_TOKEN }}
         shell: bash
diff --git a/CLAUDE.md b/CLAUDE.md
index 22ebd18de..c6aa7dc87 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -15,10 +15,15 @@ usage message is the source of truth, not the docs.
 ## Build
 
 Out-of-source CMake build, C++20, heavy use of `FetchContent` (spdlog, zstd, HDF5,
-slsDetectorPackage, Catch2, cpp-httplib, libzmq, libtiff, FFTW, Ceres, fast-feedback-indexer are
-downloaded and statically linked — the **first configure needs network access** and is slow).
-Two dependencies are deliberately **not** vendored and must come from the system: **ZLIB** and
-**Eigen3 ≥ 3.4**, both resolved with `find_package` (see the Eigen note in `CMakeLists.txt` for why).
+slsDetectorPackage, Catch2, cpp-httplib, libzmq, libtiff, FFTW, Ceres, fast-feedback-indexer, zlib-ng
+and Eigen are downloaded and statically linked — the **first configure needs network access** and is
+slow). **No library has to come from the host**: `zlib-devel`/`eigen3-devel` are no longer needed.
+zlib (as zlib-ng in zlib-compat mode) is *built during the configure* into a prefix in the build tree
+and found there via `ZLIB_ROOT`; Eigen's headers are fetched and a generated `Eigen3Config.cmake` in
+the build tree is what every `find_package(Eigen3)` resolves — ours, Ceres' and ffbidx'. A copy
+already on the machine is used instead if the configure is given `-DZLIB_ROOT=` / `-DEigen3_DIR=`.
+Do **not** turn either of these into `FetchContent ... OVERRIDE_FIND_PACKAGE` — see the Eigen note in
+`CMakeLists.txt` for the crash that rules it out.
 libjpeg-turbo is built via `ExternalProject` in `preview/`; libcurl is fetched only for viewer builds.
 
 ```
@@ -357,12 +362,17 @@ portable; don't constrain it for portability's sake.
 `JFJOCH_VIEWER_ONLY` is forced ON on Windows and macOS, so a plain configure there already builds
 just the portable subset. libtiff, libjpeg-turbo (via `ExternalProject` in `preview/`) and libcurl
 (viewer builds only) are now brought in by the build itself, so they need nothing from the host.
-Two dependencies are still supplied externally on every platform, deliberately and by decision, not
-as an open TODO: **ZLIB** and **Eigen** (header-only; needed by Ceres, by the analysis libs
-directly, and by `ffbidx` under CUDA). Both are resolved with `find_package` — the system package on
-Linux (`zlib-devel`, `eigen3-devel`), a build prefix pointed at by `CMAKE_PREFIX_PATH`/`Eigen3_DIR`
-on Windows. Vendoring Eigen through `FetchContent` with `OVERRIDE_FIND_PACKAGE` is specifically
-ruled out: it segfaults the CMake bundled with Visual Studio (see the long note in `CMakeLists.txt`).
+**ZLIB** and **Eigen** (header-only; needed by Ceres, by the analysis libs directly, and by `ffbidx`
+under CUDA) are brought in by the build too, so on Windows only Qt still has to be installed first.
+Both are still reached through an ordinary `find_package`, and that is the point: **vendoring Eigen
+through `FetchContent` with `OVERRIDE_FIND_PACKAGE` remains specifically ruled out** — it segfaults
+the CMake bundled with Visual Studio, ~1 in 3 fresh configures and 100% with Ceres CUDA on, in
+CMake's own FetchContent variable-stack cleanup (see the long note in `CMakeLists.txt`). The same
+ban applies to ZLIB, whose consumers (HDF5, libtiff, libcurl) call `find_package(ZLIB)` from inside
+their own `FetchContent_MakeAvailable` — the exact faulting pattern. Instead each is made findable
+the ordinary way before anything looks for it: zlib-ng is configured, built and installed into a
+build-tree prefix during the configure and found through `ZLIB_ROOT`, and a generated
+`Eigen3Config.cmake` in the build tree is pointed at by `Eigen3_DIR`.
 Qt is supplied externally as before.
 
 ## OpenAPI is the single source of truth
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98aad8f60..8e62becf9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" JFJOCH_VERSION_NUMERIC "${JFJOCH_
 
 PROJECT(jfjoch VERSION ${JFJOCH_VERSION_NUMERIC} LANGUAGES C CXX)
 SET(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+INCLUDE(GNUInstallDirs)
 
 SET(CMAKE_CXX_STANDARD 20)
 SET(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -59,10 +60,6 @@ ENDIF()
 # GB10 (DGX Spark, sm_121) and GH200 (Grace Hopper, sm_90) passes -DJFJOCH_CUDA_ARCHITECTURES="90;121".
 SET(JFJOCH_CUDA_ARCHITECTURES "" CACHE STRING "Override the CUDA architecture list (empty = the default set below)")
 
-SET (ZLIB_USE_STATIC_LIBS TRUE)
-
-FIND_PACKAGE(ZLIB REQUIRED)
-
 OPTION(SLS9 "Build with sls_detector_package v9.2.0" OFF)
 
 SET(BUILD_SHARED_LIBS OFF)
@@ -110,7 +107,7 @@ ELSE()
 ENDIF()
 SET(CMAKE_CUDA_STANDARD 20)
 SET(CMAKE_CUDA_STANDARD_REQUIRED True)
-SET(CMAKE_CUDA_FLAGS_RELEASE "-O3 -lineinfo")
+SET(CMAKE_CUDA_FLAGS_RELEASE "-O3 -DNDEBUG -lineinfo")
 SET(CMAKE_CUDA_RUNTIME_LIBRARY Static)
 
 SET(JFJOCH_CUDA_AVAILABLE OFF)
@@ -150,6 +147,119 @@ INCLUDE_DIRECTORIES(include)
 
 include(FetchContent)
 
+# Dependencies are fetched as PINNED TARBALLS, not git clones. GitHub throttles unauthenticated
+# git-upload-pack and picks its targets by TLS fingerprint, so a clone answers 200 to the initial
+# ref advertisement and then 401 to the fetch itself; git asks for a password, finds no terminal,
+# and the configure stops dead with no error. Which images it hits follows their OpenSSL version,
+# which is why it looks like a broken build image rather than a rate limit. The archive endpoint is
+# not part of that campaign, and a tarball is a fraction of the transfer (hdf5: 40 MB against a
+# 271 MB shallow clone), so it is both the fix and the cheaper fetch.
+#
+# Every URL is pinned by tag or commit and its bytes by URL_HASH, so a silently changed archive
+# fails the configure instead of entering the build. To bump one: change the version in the URL and
+# replace the hash with `sha256sum` of the new tarball.
+#
+# Ceres needs one extra step for its abseil submodule; see image_analysis/CMakeLists.txt.
+
+# zlib, via zlib-ng in its zlib-compatible mode: same zlib.h, same API and symbol names, faster
+# deflate. It used to be the one compression library the project asked the host for; providing it
+# here is what makes a build need no zlib-devel.
+#
+# It is built HERE, during the configure, into a small install prefix in the build tree, and
+# ZLIB_ROOT then points every find_package(ZLIB) at it -- ours and those of HDF5, libtiff,
+# cpp-httplib and libcurl. Two alternatives were rejected:
+#
+#  * FetchContent OVERRIDE_FIND_PACKAGE is the mechanism banned by the Eigen note further down
+#    (it segfaults the CMake bundled with Visual Studio), and a subproject's find_package(ZLIB)
+#    resolving an override through a nested FetchContent_MakeAvailable is exactly the faulting
+#    pattern.
+#  * Adding zlib-ng with add_subdirectory and aliasing its target to ZLIB::ZLIB looks simpler, but
+#    ZLIB::ZLIB is then an alias of a target built in this project, and libcurl puts ZLIB::ZLIB in
+#    CMAKE_REQUIRED_LIBRARIES for its OpenSSL feature checks. try_compile only accepts IMPORTED
+#    targets, so that is a hard configure error, not a degraded check (verified).
+#
+# Building it first and finding it as an ordinary installed library avoids both: every consumer
+# runs the stock FindZLIB module against a real libz.a and gets a genuine imported target.
+#
+# Passing -DZLIB_ROOT=<prefix> skips the build below and uses the zlib found there instead.
+IF (NOT ZLIB_ROOT)
+    SET(ZLIB_ROOT "${CMAKE_BINARY_DIR}/zlib-ng-install")
+    IF (NOT EXISTS "${ZLIB_ROOT}/include/zlib.h")
+        FetchContent_Declare(zlib
+                URL https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.3.3.tar.gz
+                URL_HASH SHA256=f9c65aa9c852eb8255b636fd9f07ce1c406f061ec19a2e7d508b318ca0c907d1
+                SOURCE_SUBDIR  cmake)  # no CMakeLists.txt there: populate only, do not add_subdirectory
+        FetchContent_MakeAvailable(zlib)
+
+        # The nested configure inherits the toolchain, not the environment: pass the compiler, the
+        # flags and the platform selection explicitly, or a cross build (or an MSVC build with a
+        # non-default platform/toolset/runtime) would silently produce a library for the wrong one.
+        SET(JFJOCH_ZLIB_CMAKE_ARGS
+                -DCMAKE_INSTALL_PREFIX=${ZLIB_ROOT}
+                -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+                -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+                -DCMAKE_POSITION_INDEPENDENT_CODE=ON   # xds-plugin is a shared library
+                -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+                -DBUILD_SHARED_LIBS=OFF
+                -DBUILD_TESTING=OFF
+                -DINSTALL_UTILS=OFF
+                -DZLIB_COMPAT=ON            # provide zlib.h and the zlib API, not zlib-ng.h
+                -DWITH_GZFILEOP=ON          # gzopen/gzread: GEMMI reads gzipped MTZ and CIF
+                -DWITH_NATIVE_INSTRUCTIONS=OFF)  # portable binary; SIMD is chosen at run time
+        SET(JFJOCH_ZLIB_FORWARD CMAKE_TOOLCHAIN_FILE CMAKE_MSVC_RUNTIME_LIBRARY
+                                CMAKE_OSX_ARCHITECTURES CMAKE_OSX_SYSROOT CMAKE_OSX_DEPLOYMENT_TARGET)
+        # CMAKE_SYSTEM_NAME only when actually cross-compiling: setting it is what PUTS a build into
+        # cross mode, so forwarding it unconditionally would make even a native zlib-ng think it is
+        # being cross-compiled.
+        IF (CMAKE_CROSSCOMPILING)
+            LIST(APPEND JFJOCH_ZLIB_FORWARD CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PROCESSOR)
+        ENDIF()
+        FOREACH (_var IN LISTS JFJOCH_ZLIB_FORWARD)
+            IF (${_var})
+                LIST(APPEND JFJOCH_ZLIB_CMAKE_ARGS "-D${_var}=${${_var}}")
+            ENDIF()
+        ENDFOREACH()
+        IF (CMAKE_GENERATOR_PLATFORM)
+            LIST(APPEND JFJOCH_ZLIB_CMAKE_ARGS -A "${CMAKE_GENERATOR_PLATFORM}")
+        ENDIF()
+        IF (CMAKE_GENERATOR_TOOLSET)
+            LIST(APPEND JFJOCH_ZLIB_CMAKE_ARGS -T "${CMAKE_GENERATOR_TOOLSET}")
+        ENDIF()
+        # Single-config generators pick the configuration at configure time, multi-config ones at
+        # build time; give each the one it reads and keep both on this build's configuration.
+        IF (CMAKE_CONFIGURATION_TYPES OR NOT CMAKE_BUILD_TYPE)
+            SET(JFJOCH_ZLIB_CONFIG Release)
+        ELSE()
+            SET(JFJOCH_ZLIB_CONFIG ${CMAKE_BUILD_TYPE})
+        ENDIF()
+        IF (NOT CMAKE_CONFIGURATION_TYPES)
+            LIST(APPEND JFJOCH_ZLIB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${JFJOCH_ZLIB_CONFIG})
+        ENDIF()
+
+        MESSAGE(STATUS "Building zlib-ng (zlib-compatible) into ${ZLIB_ROOT}")
+        EXECUTE_PROCESS(
+                COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ${JFJOCH_ZLIB_CMAKE_ARGS}
+                        -S "${zlib_SOURCE_DIR}" -B "${zlib_BINARY_DIR}"
+                RESULT_VARIABLE JFJOCH_ZLIB_RESULT
+                OUTPUT_VARIABLE JFJOCH_ZLIB_LOG ERROR_VARIABLE JFJOCH_ZLIB_LOG)
+        IF (JFJOCH_ZLIB_RESULT EQUAL 0)
+            EXECUTE_PROCESS(
+                    COMMAND ${CMAKE_COMMAND} --build "${zlib_BINARY_DIR}" --config ${JFJOCH_ZLIB_CONFIG}
+                            --target install
+                    RESULT_VARIABLE JFJOCH_ZLIB_RESULT
+                    OUTPUT_VARIABLE JFJOCH_ZLIB_LOG ERROR_VARIABLE JFJOCH_ZLIB_LOG)
+        ENDIF()
+        IF (NOT JFJOCH_ZLIB_RESULT EQUAL 0)
+            MESSAGE(FATAL_ERROR "Building the bundled zlib-ng failed:\n${JFJOCH_ZLIB_LOG}\n"
+                                "Re-run the configure with -DZLIB_ROOT=<prefix> to use a zlib "
+                                "already on this machine.")
+        ENDIF()
+    ENDIF()
+ENDIF()
+
+SET(ZLIB_USE_STATIC_LIBS TRUE)
+FIND_PACKAGE(ZLIB REQUIRED)
+
 SET(HDF5_ENABLE_SZIP_SUPPORT OFF CACHE BOOL "" FORCE)
 SET(HDF5_ENABLE_SZIP_ENCODING OFF CACHE BOOL "" FORCE)
 SET(HDF5_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
@@ -168,48 +278,49 @@ SET(HTTPLIB_REQUIRE_ZLIB ON CACHE BOOL "" FORCE)
 
 FetchContent_Declare(
         spdlog
-        GIT_REPOSITORY https://github.com/gabime/spdlog.git
-        GIT_TAG v1.17.0
+        URL https://github.com/gabime/spdlog/archive/refs/tags/v1.17.0.tar.gz
+        URL_HASH SHA256=d8862955c6d74e5846b3f580b1605d2428b11d97a410d86e2fb13e857cd3a744
         EXCLUDE_FROM_ALL
 )
 
 FetchContent_Declare(
         zstd
-        GIT_REPOSITORY https://github.com/facebook/zstd
-        GIT_TAG 794ea1b0afca0f020f4e57b6732332231fb23c70
+        URL https://github.com/facebook/zstd/archive/refs/tags/v1.5.7.tar.gz
+        URL_HASH SHA256=37d7284556b20954e56e1ca85b80226768902e2edabd3b649e9e72c0c9012ee3
         SOURCE_SUBDIR build/cmake
         EXCLUDE_FROM_ALL
 )
 
 FetchContent_Declare(hdf5
-        GIT_REPOSITORY https://github.com/HDFGroup/hdf5/
-        GIT_TAG hdf5_2.1.0
-        GIT_SHALLOW 1
+        URL https://github.com/HDFGroup/hdf5/archive/refs/tags/2.2.0.tar.gz
+        URL_HASH SHA256=5b8d75125ae7b4fef55d3b39e8d3dbfd238cdf63b6518afd67fa69ac80f06542
         EXCLUDE_FROM_ALL)
 
-SET(SLS_DETECTOR_GIT_TAG "8.0.2")
+SET(SLS_DETECTOR_VERSION "8.0.2")
+SET(SLS_DETECTOR_SHA256 "783b557ebff281a537ec70a20a775dd412dd345bfcefff85988ecfafe703222a")
 IF(SLS9)
-    SET(SLS_DETECTOR_GIT_TAG "9.2.0")
+    SET(SLS_DETECTOR_VERSION "9.2.0")
+    SET(SLS_DETECTOR_SHA256 "020a7791934e5a9d034cfa4c1c69df7109488ab2f80a4e7fca07b3e51978933f")
 ENDIF()
 
 FetchContent_Declare(
         sls_detector_package
-        GIT_REPOSITORY https://github.com/slsdetectorgroup/slsDetectorPackage
-        GIT_TAG ${SLS_DETECTOR_GIT_TAG}
+        URL https://github.com/slsdetectorgroup/slsDetectorPackage/archive/refs/tags/${SLS_DETECTOR_VERSION}.tar.gz
+        URL_HASH SHA256=${SLS_DETECTOR_SHA256}
         EXCLUDE_FROM_ALL
 )
 
 FetchContent_Declare(
         catch2
-        GIT_REPOSITORY https://github.com/catchorg/Catch2
-        GIT_TAG v3.13.0
+        URL https://github.com/catchorg/Catch2/archive/refs/tags/v3.16.0.tar.gz
+        URL_HASH SHA256=0957cae5821b17ce07f0833aaa52b5137643a8382203221f363a8303c109af34
         EXCLUDE_FROM_ALL
 )
 
 FetchContent_Declare(
         httplib
-        GIT_REPOSITORY https://github.com/yhirose/cpp-httplib.git
-        GIT_TAG v0.39.0
+        URL https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.56.0.tar.gz
+        URL_HASH SHA256=41f214d844e3b9117b734a8cc305b6141c5b47d63009681944e03bc31d92b9ca
         EXCLUDE_FROM_ALL
 )
 # httplib enables Brotli content-encoding whenever it finds system Brotli; we don't use it
@@ -234,8 +345,8 @@ SET(WITH_DOCS      OFF CACHE BOOL "" FORCE)   # libzmq: no docs
 SET(ENABLE_CPACK   OFF CACHE BOOL "" FORCE)   # libzmq: no CPack injection
 FetchContent_Declare(
         libzmq
-        GIT_REPOSITORY https://github.com/zeromq/libzmq.git
-        GIT_TAG v4.3.5
+        URL https://github.com/zeromq/libzmq/archive/refs/tags/v4.3.5.tar.gz
+        URL_HASH SHA256=6c972d1e6a91a0ecd79c3236f04cf0126f2f4dfbbad407d72b4606a7ba93f9c6
         EXCLUDE_FROM_ALL
 )
 
@@ -273,8 +384,8 @@ SET(lerc OFF)
 SET(tiff-tools OFF)
 SET(tiff-tests OFF)
 FetchContent_Declare(tiff
-        GIT_REPOSITORY https://gitlab.com/libtiff/libtiff.git
-        GIT_TAG v4.7.1
+        URL https://gitlab.com/libtiff/libtiff/-/archive/v4.7.2/libtiff-v4.7.2.tar.gz
+        URL_HASH SHA256=62b15f44c10106065211efa22a2dc77937bd97ee1f6e3afd2c9659010de112eb
         EXCLUDE_FROM_ALL)
 FetchContent_MakeAvailable(tiff)
 
@@ -304,16 +415,53 @@ FetchContent_MakeAvailable(fftw)
 TARGET_INCLUDE_DIRECTORIES(fftw3f INTERFACE $<BUILD_INTERFACE:${fftw_SOURCE_DIR}/api>)
 ADD_COMPILE_DEFINITIONS(JFJOCH_USE_FFTW)
 
-# Eigen is an EXTERNAL dependency (like ZLIB), resolved by find_package(Eigen3) in the subdirectories
-# that need it (image_analysis, and transitively Ceres and ffbidx). It is deliberately NOT vendored
-# via FetchContent: declaring Eigen with OVERRIDE_FIND_PACKAGE makes the CMake bundled with Visual
-# Studio (cmake 4.x "-msvc") intermittently SEGFAULT during configure. The fault is in CMake's own
-# FetchContent variable-stack cleanup, reached when Ceres' find_package(Eigen3) resolves the override
-# through a nested FetchContent_MakeAvailable -- ~1 in 3 fresh configures, and 100% with Ceres CUDA on.
-# Stock Kitware CMake runs the identical scripts fine, so it is a bug in the VS-bundled cmake binary;
-# providing Eigen externally avoids that code path entirely and is stable (verified, both Ceres CUDA
-# on and off). Provide it via the system package on Linux (eigen3-devel / libeigen3-dev) or a build
-# prefix on Windows (point CMAKE_PREFIX_PATH / Eigen3_DIR at it), exactly as for ZLIB.
+# Eigen (header-only), consumed by the analysis libraries directly and by Ceres and ffbidx through
+# their own find_package(Eigen3). The headers are fetched here and a two-file config package for
+# them is written into the build tree; Eigen3_DIR then points at it, so every find_package(Eigen3)
+# in the build -- ours, Ceres', ffbidx' -- resolves through the ordinary config path and gets this
+# one copy. Nothing needs Eigen's own CMake, so the source is populated but never added.
+#
+# The obvious route, FetchContent_Declare(Eigen3 ... OVERRIDE_FIND_PACKAGE), IS BANNED and must not
+# be reintroduced: it makes the CMake bundled with Visual Studio (cmake 4.x "-msvc") intermittently
+# SEGFAULT during configure -- ~1 in 3 fresh configures, and 100% with Ceres CUDA on. The fault is
+# in CMake's own FetchContent variable-stack cleanup, reached when Ceres' find_package(Eigen3)
+# resolves the override through a nested FetchContent_MakeAvailable. Stock Kitware CMake runs the
+# identical scripts fine, so it is a bug in the VS-bundled cmake binary. A generated config package
+# never enters that machinery: find_package finds an ordinary Eigen3Config.cmake on disk, exactly as
+# it would for an Eigen installed on the system.
+#
+# Passing -DEigen3_DIR=<dir> skips the fetch and uses the Eigen whose config package lives there.
+SET(JFJOCH_EIGEN_VERSION 3.4.1)
+IF (Eigen3_DIR)
+    MESSAGE(STATUS "Eigen3_DIR is set (${Eigen3_DIR}) -- using that Eigen instead of the bundled one")
+ELSE()
+    FetchContent_Declare(eigen3
+            URL https://gitlab.com/libeigen/eigen/-/archive/${JFJOCH_EIGEN_VERSION}/eigen-${JFJOCH_EIGEN_VERSION}.tar.gz
+            URL_HASH SHA256=b93c667d1b69265cdb4d9f30ec21f8facbbe8b307cf34c0b9942834c6d4fdbe2
+            SOURCE_SUBDIR  cmake)  # no CMakeLists.txt there: populate only, do not add_subdirectory
+    FetchContent_MakeAvailable(eigen3)
+
+    SET(JFJOCH_EIGEN_CONFIG_DIR "${CMAKE_BINARY_DIR}/eigen3-config")
+    FILE(WRITE "${JFJOCH_EIGEN_CONFIG_DIR}/Eigen3Config.cmake"
+"# Generated by the Jungfraujoch build -- do not edit.\n"
+"if (NOT TARGET Eigen3::Eigen)\n"
+"    add_library(Eigen3::Eigen INTERFACE IMPORTED GLOBAL)\n"
+"    set_target_properties(Eigen3::Eigen PROPERTIES\n"
+"        INTERFACE_INCLUDE_DIRECTORIES \"${eigen3_SOURCE_DIR}\")\n"
+"endif()\n"
+"set(EIGEN3_INCLUDE_DIR  \"${eigen3_SOURCE_DIR}\")\n"
+"set(EIGEN3_INCLUDE_DIRS \"${eigen3_SOURCE_DIR}\")\n"
+"set(EIGEN3_VERSION_STRING \"${JFJOCH_EIGEN_VERSION}\")\n"
+"set(Eigen3_FOUND TRUE)\n")
+    # AnyNewerVersion, not Eigen's own SameMajorVersion rule: Ceres asks for a version RANGE,
+    # find_package(Eigen3 3.3.4...5 NO_MODULE), and a same-major file declines any range whose two
+    # endpoints differ in major version. Eigen's own config file does exactly that, which is how a
+    # build could end up compiling Ceres against one Eigen and everything else against another.
+    INCLUDE(CMakePackageConfigHelpers)
+    WRITE_BASIC_PACKAGE_VERSION_FILE("${JFJOCH_EIGEN_CONFIG_DIR}/Eigen3ConfigVersion.cmake"
+            VERSION ${JFJOCH_EIGEN_VERSION} COMPATIBILITY AnyNewerVersion ARCH_INDEPENDENT)
+    SET(Eigen3_DIR "${JFJOCH_EIGEN_CONFIG_DIR}")
+ENDIF()
 
 # getopt/getopt_long shim for Windows: the MSVC CRT has no <getopt.h>. Vendored OpenBSD/NetBSD
 # implementation (BSD-licensed). Built only on Windows and defined here, before the subdirectories,
@@ -347,8 +495,8 @@ IF (JFJOCH_VIEWER_BUILD OR JFJOCH_VIEWER_ONLY)
         SET(CURL_USE_GSSAPI   ON CACHE BOOL "" FORCE)  # Kerberos via system krb5 (needs krb5-dev)
     ENDIF()
     FetchContent_Declare(curl
-            GIT_REPOSITORY https://github.com/curl/curl.git
-            GIT_TAG curl-8_11_1
+            URL https://github.com/curl/curl/archive/refs/tags/curl-8_22_0.tar.gz
+            URL_HASH SHA256=222c6b5c1f368ac63aed59bce2774eb5def9e8e67e46e800be182e684d2845a3
             EXCLUDE_FROM_ALL)
     FetchContent_MakeAvailable(curl)
     # The viewer links libcurl_static (curl's concrete static-lib target) directly rather than the
diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md
index 68dc7d9c2..1ab0d05af 100644
--- a/THIRD_PARTY_NOTICES.md
+++ b/THIRD_PARTY_NOTICES.md
@@ -19,21 +19,35 @@ linked into the Jungfraujoch executables.
 | Component | Version | Copyright | License (SPDX) | License text |
 |---|---|---|---|---|
 | [spdlog](https://github.com/gabime/spdlog) | 1.17.0 | Gabi Melman | MIT | [spdlog.txt](licenses/spdlog.txt) |
-| [Zstandard](https://github.com/facebook/zstd) | (pinned) | Meta Platforms, Inc. | BSD-3-Clause | [zstd.txt](licenses/zstd.txt) |
-| [HDF5](https://github.com/HDFGroup/hdf5) | 2.1.0 | The HDF Group; UIUC | BSD-3-Clause-style | [hdf5.txt](licenses/hdf5.txt) |
+| [Zstandard](https://github.com/facebook/zstd) | 1.5.7 | Meta Platforms, Inc. | BSD-3-Clause | [zstd.txt](licenses/zstd.txt) |
+| [HDF5](https://github.com/HDFGroup/hdf5) | 2.2.0 | The HDF Group; UIUC | BSD-3-Clause-style + Apache-2.0 | [hdf5.txt](licenses/hdf5.txt) |
 | [slsDetectorPackage](https://github.com/slsdetectorgroup/slsDetectorPackage) | 8.0.2 / 9.2.0 | PSI | LGPL-3.0-or-later | [LGPL](licenses/slsDetectorPackage-LGPL-3.0.txt), [GPL](licenses/slsDetectorPackage-GPL-3.0.txt) |
-| [cpp-httplib](https://github.com/yhirose/cpp-httplib) | 0.39.0 | Yuji Hirose | MIT | [cpp-httplib.txt](licenses/cpp-httplib.txt) |
+| [cpp-httplib](https://github.com/yhirose/cpp-httplib) | 0.56.0 | Yuji Hirose | MIT | [cpp-httplib.txt](licenses/cpp-httplib.txt) |
 | [libzmq (ZeroMQ)](https://github.com/zeromq/libzmq) | 4.3.5 | iMatix and contributors | MPL-2.0 | [libzmq.txt](licenses/libzmq.txt) |
-| [libtiff](https://gitlab.com/libtiff/libtiff) | 4.7.1 | Sam Leffler; SGI | libtiff (BSD-like) | [libtiff.txt](licenses/libtiff.txt) |
+| [libtiff](https://gitlab.com/libtiff/libtiff) | 4.7.2 | Sam Leffler; SGI | libtiff (BSD-like) | [libtiff.txt](licenses/libtiff.txt) |
 | [FFTW](https://www.fftw.org/) | 3.3.10 | Matteo Frigo; MIT | GPL-2.0-or-later | [fftw.txt](licenses/fftw.txt) |
 | [Ceres Solver](https://github.com/ceres-solver/ceres-solver) | (pinned) | Google Inc. and contributors | BSD-3-Clause | [ceres-solver.txt](licenses/ceres-solver.txt) |
+| [Abseil](https://github.com/abseil/abseil-cpp) | 20250127 (required by Ceres) | Google Inc. | Apache-2.0 | [abseil.txt](licenses/abseil.txt) |
 | [fast-feedback-indexer](https://github.com/paulscherrerinstitute/fast-feedback-indexer) | (pinned) | PSI | BSD-3-Clause | [fast-feedback-indexer.txt](licenses/fast-feedback-indexer.txt) |
-| [libjpeg-turbo](https://github.com/libjpeg-turbo/libjpeg-turbo) | (pinned) | D. R. Commander and others; IJG | IJG + BSD-3-Clause + Zlib | [libjpeg-turbo.txt](licenses/libjpeg-turbo.txt) |
-| [Catch2](https://github.com/catchorg/Catch2) | 3.13.0 | Catch2 Authors | BSL-1.0 | [catch2.txt](licenses/catch2.txt) |
+| [libjpeg-turbo](https://github.com/libjpeg-turbo/libjpeg-turbo) | 3.2.0 | D. R. Commander and others; IJG | IJG + BSD-3-Clause + Zlib | [libjpeg-turbo.txt](licenses/libjpeg-turbo.txt) |
+| [curl](https://github.com/curl/curl) | 8.22.0 | Daniel Stenberg and contributors | curl (MIT-like) | [curl.txt](licenses/curl.txt) |
+| [Catch2](https://github.com/catchorg/Catch2) | 3.16.0 | Catch2 Authors | BSL-1.0 | [catch2.txt](licenses/catch2.txt) |
+| [zlib-ng](https://github.com/zlib-ng/zlib-ng) | 2.3.3 | Jean-loup Gailly and Mark Adler; the zlib-ng contributors | Zlib | [zlib.txt](licenses/zlib.txt) |
+| [Eigen](https://gitlab.com/libeigen/eigen) | 3.4.1 | Benoit Jacob, Gael Guennebaud and contributors | MPL-2.0 (+ BSD parts) | [eigen.txt](licenses/eigen.txt), [README](licenses/eigen-README.txt) |
+
+libcurl is fetched and statically linked only for viewer builds (`JFJOCH_VIEWER_BUILD` /
+`JFJOCH_VIEWER_ONLY`), where it is `jfjoch_viewer`'s HTTP client; the broker and writer never link
+it. Its TLS and Kerberos backends are the OS-native ones (Schannel/SSPI on Windows, OpenSSL and
+system krb5 on Linux), so no TLS stack is vendored with it.
 
 Catch2 is used only to build the test binary (`jfjoch_test`) and is not part of any shipped
 artifact; it is listed here for completeness.
 
+zlib is supplied by zlib-ng built in its zlib-compatible mode (same `zlib.h`, same API and symbol
+names), so it is the zlib that HDF5, libtiff, cpp-httplib, libcurl and GEMMI all link. It is
+built during the configure rather than added as a subproject; the licence is the zlib licence
+either way. Eigen is header-only: only its headers reach the binaries, and no Eigen CMake runs.
+
 ## Vendored directly in the repository
 
 These are copied into the source tree (see the path) rather than fetched.
@@ -64,8 +78,6 @@ These are copied into the source tree (see the path) rather than fetched.
 |---|---|---|---|
 | [Qt 6](https://www.qt.io/) | `jfjoch_viewer` | LGPL-3.0 | [notice](licenses/Qt6-NOTICE.txt), [LGPL-3.0](licenses/Qt6-LGPL-3.0.txt) |
 | [NVIDIA CUDA Toolkit](https://developer.nvidia.com/cuda-toolkit) (cudart, cuFFT) | CUDA builds | NVIDIA CUDA EULA | [notice](licenses/NVIDIA-CUDA-NOTICE.txt), [EULA](licenses/NVIDIA-CUDA-EULA.txt) |
-| [zlib](https://zlib.net/) | everywhere (compression) | Zlib | [zlib.txt](licenses/zlib.txt) |
-| [Eigen](https://gitlab.com/libeigen/eigen) | analysis libs, Ceres, ffbidx (header-only) | MPL-2.0 (+ BSD parts) | [eigen.txt](licenses/eigen.txt), [README](licenses/eigen-README.txt) |
 
 ## Frontend (npm) dependencies
 
@@ -82,7 +94,7 @@ served frontend, so the shipped web UI carries its own attribution.
 ## Notes on weak-copyleft and attribution-sensitive components
 
 * **MPL-2.0** (Eigen, GEMMI, libzmq, traccc): file-level copyleft. GEMMI is vendored in `gemmi_gph/`
-  in trimmed form; libzmq is fetched at build time; Eigen is provided externally (header-only). The
+  in trimmed form; libzmq and Eigen are fetched at build time (Eigen is header-only). The
   corresponding source is available from each project upstream.
 * **GEMMI's own bundled third-party headers** — PEGTL, sajson, fast_float, half, pocketfft and
   tinydir, all under `gemmi_gph/gemmi/third_party/` — are listed separately above rather than being
diff --git a/VERSION b/VERSION
index ca5edd43e..a339a156b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0-rc.168
+1.0.0-rc.169
diff --git a/broker/CMakeLists.txt b/broker/CMakeLists.txt
index afd91bd2b..ca4cdd7e1 100644
--- a/broker/CMakeLists.txt
+++ b/broker/CMakeLists.txt
@@ -1,6 +1,3 @@
-# OpenAPI definition
-INSTALL(FILES redoc-static.html DESTINATION jfjoch/frontend COMPONENT jfjoch )
-
 # OpenAPI model
 AUX_SOURCE_DIRECTORY(gen/model MODEL_SOURCES)
 ADD_LIBRARY(JFJochAPI STATIC ${MODEL_SOURCES})
diff --git a/broker/JFJochServices.cpp b/broker/JFJochServices.cpp
index baa81aafa..944da2aeb 100644
--- a/broker/JFJochServices.cpp
+++ b/broker/JFJochServices.cpp
@@ -65,6 +65,11 @@ void JFJochServices::Start(const DiffractionExperiment& experiment,
 }
 
 void JFJochServices::Off() {
+    // Disconnect explicitly rather than relying on the destructor: the receiver service keeps its
+    // own shared_ptr to the puller of the last run, so dropping this one does not necessarily close
+    // the socket, and a puller left connected keeps taking its share of the detector stream.
+    if (image_puller)
+        image_puller->Disconnect();
     image_puller.reset();
 
     std::unique_ptr<DetectorWrapper> old_detector;
@@ -84,6 +89,16 @@ void JFJochServices::On(DiffractionExperiment &x) {
         detector.reset();
     } else {
         logger.Info("Detector on");
+
+        // The previous puller has to be disconnected before the new one connects. Dropping the
+        // shared_ptr is not enough: the receiver service keeps its own reference to the puller of
+        // the last run, so the socket would stay open - and two PULL sockets on the same DECTRIS
+        // stream share the messages round-robin, so the old one silently swallows half of the
+        // stream, the start message included. The run then never starts and the receiver waits for
+        // a start message that has already been thrown away.
+        if (image_puller)
+            image_puller->Disconnect();
+
         std::unique_ptr<DetectorWrapper> new_detector;
         switch (x.GetDetectorType()) {
             case DetectorType::EIGER:
diff --git a/broker/JFJochStateMachine.cpp b/broker/JFJochStateMachine.cpp
index 8db2cd1e4..cc65b946f 100644
--- a/broker/JFJochStateMachine.cpp
+++ b/broker/JFJochStateMachine.cpp
@@ -158,6 +158,18 @@ bool JFJochStateMachine::TakeDarkMaskInternal(std::unique_lock<std::mutex> &ul)
     auto mask_output = services.Stop();
     ul.lock();
 
+    // A cancelled collection still hands back a full-size mask - it is built from whatever dark
+    // frames arrived, and every pixel that saw none reads as good - so the size check below accepts
+    // it and the sequence goes on to report a calibration it never took as done. The dark mask is a
+    // single step, so unlike a pedestal sequence there is no later step whose cancel_sequence check
+    // would catch it. Refuse it the way the check at the top of this function does.
+    if (cancel_sequence || mask_output.receiver_output.status.cancelled) {
+        SetState(JFJochState::Inactive,
+                 "Mask sequence cancelled",
+                 BrokerStatus::MessageSeverity::Error);
+        return false;
+    }
+
     if (mask_output.receiver_output.dark_mask_result.size() != local_experiment.GetPixelsNum()) {
         SetState(JFJochState::Error, "Mask not collected properly", BrokerStatus::MessageSeverity::Error);
         return false;
diff --git a/broker/gen/model/Azim_int_settings.cpp b/broker/gen/model/Azim_int_settings.cpp
index 64dd2dd1d..324af9dfc 100644
--- a/broker/gen/model/Azim_int_settings.cpp
+++ b/broker/gen/model/Azim_int_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Azim_int_settings.h b/broker/gen/model/Azim_int_settings.h
index 529024ef0..779b862b2 100644
--- a/broker/gen/model/Azim_int_settings.h
+++ b/broker/gen/model/Azim_int_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Bragg_integration_settings.cpp b/broker/gen/model/Bragg_integration_settings.cpp
index 62957f317..75004e911 100644
--- a/broker/gen/model/Bragg_integration_settings.cpp
+++ b/broker/gen/model/Bragg_integration_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Bragg_integration_settings.h b/broker/gen/model/Bragg_integration_settings.h
index 56481bbc6..79a13e79d 100644
--- a/broker/gen/model/Bragg_integration_settings.h
+++ b/broker/gen/model/Bragg_integration_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Broker_status.cpp b/broker/gen/model/Broker_status.cpp
index 87ac31fb1..3c55c48ea 100644
--- a/broker/gen/model/Broker_status.cpp
+++ b/broker/gen/model/Broker_status.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Broker_status.h b/broker/gen/model/Broker_status.h
index d53d8855e..17d2d6bec 100644
--- a/broker/gen/model/Broker_status.h
+++ b/broker/gen/model/Broker_status.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Calibration_statistics_inner.cpp b/broker/gen/model/Calibration_statistics_inner.cpp
index 94bfb9e98..9a503a04b 100644
--- a/broker/gen/model/Calibration_statistics_inner.cpp
+++ b/broker/gen/model/Calibration_statistics_inner.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Calibration_statistics_inner.h b/broker/gen/model/Calibration_statistics_inner.h
index f3fcecac0..6643f6d97 100644
--- a/broker/gen/model/Calibration_statistics_inner.h
+++ b/broker/gen/model/Calibration_statistics_inner.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Dark_mask_settings.cpp b/broker/gen/model/Dark_mask_settings.cpp
index 27ca1acf9..7cfb3c2a1 100644
--- a/broker/gen/model/Dark_mask_settings.cpp
+++ b/broker/gen/model/Dark_mask_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Dark_mask_settings.h b/broker/gen/model/Dark_mask_settings.h
index 233e80f0c..3c05e0f39 100644
--- a/broker/gen/model/Dark_mask_settings.h
+++ b/broker/gen/model/Dark_mask_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Dataset_settings.cpp b/broker/gen/model/Dataset_settings.cpp
index b2982606f..77b680352 100644
--- a/broker/gen/model/Dataset_settings.cpp
+++ b/broker/gen/model/Dataset_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Dataset_settings.h b/broker/gen/model/Dataset_settings.h
index 0cf8b8f22..7e3c1b5f9 100644
--- a/broker/gen/model/Dataset_settings.h
+++ b/broker/gen/model/Dataset_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Dataset_settings_smargon.cpp b/broker/gen/model/Dataset_settings_smargon.cpp
index 35b7d388f..3fa2bd30e 100644
--- a/broker/gen/model/Dataset_settings_smargon.cpp
+++ b/broker/gen/model/Dataset_settings_smargon.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Dataset_settings_smargon.h b/broker/gen/model/Dataset_settings_smargon.h
index 0b961da1f..087a312b4 100644
--- a/broker/gen/model/Dataset_settings_smargon.h
+++ b/broker/gen/model/Dataset_settings_smargon.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Dataset_settings_xray_fluorescence_spectrum.cpp b/broker/gen/model/Dataset_settings_xray_fluorescence_spectrum.cpp
index bd1fee17e..61d654bbf 100644
--- a/broker/gen/model/Dataset_settings_xray_fluorescence_spectrum.cpp
+++ b/broker/gen/model/Dataset_settings_xray_fluorescence_spectrum.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Dataset_settings_xray_fluorescence_spectrum.h b/broker/gen/model/Dataset_settings_xray_fluorescence_spectrum.h
index 39e90b71c..4eb1c0459 100644
--- a/broker/gen/model/Dataset_settings_xray_fluorescence_spectrum.h
+++ b/broker/gen/model/Dataset_settings_xray_fluorescence_spectrum.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector.cpp b/broker/gen/model/Detector.cpp
index 28c12f30c..38a449d5b 100644
--- a/broker/gen/model/Detector.cpp
+++ b/broker/gen/model/Detector.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector.h b/broker/gen/model/Detector.h
index b0b6c07cd..1adad0bf8 100644
--- a/broker/gen/model/Detector.h
+++ b/broker/gen/model/Detector.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_list.cpp b/broker/gen/model/Detector_list.cpp
index 924ae6983..eea5d47ba 100644
--- a/broker/gen/model/Detector_list.cpp
+++ b/broker/gen/model/Detector_list.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_list.h b/broker/gen/model/Detector_list.h
index e8a61c5c6..93a12f1de 100644
--- a/broker/gen/model/Detector_list.h
+++ b/broker/gen/model/Detector_list.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_list_element.cpp b/broker/gen/model/Detector_list_element.cpp
index 5e0d4dc62..eb76feff9 100644
--- a/broker/gen/model/Detector_list_element.cpp
+++ b/broker/gen/model/Detector_list_element.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_list_element.h b/broker/gen/model/Detector_list_element.h
index dcb7faaad..808b34981 100644
--- a/broker/gen/model/Detector_list_element.h
+++ b/broker/gen/model/Detector_list_element.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_module.cpp b/broker/gen/model/Detector_module.cpp
index d97798acf..24bfa8350 100644
--- a/broker/gen/model/Detector_module.cpp
+++ b/broker/gen/model/Detector_module.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_module.h b/broker/gen/model/Detector_module.h
index ff1940584..c8eddd767 100644
--- a/broker/gen/model/Detector_module.h
+++ b/broker/gen/model/Detector_module.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_module_direction.cpp b/broker/gen/model/Detector_module_direction.cpp
index b801828fc..81bbfa8f5 100644
--- a/broker/gen/model/Detector_module_direction.cpp
+++ b/broker/gen/model/Detector_module_direction.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_module_direction.h b/broker/gen/model/Detector_module_direction.h
index 424c82fb9..33c605a16 100644
--- a/broker/gen/model/Detector_module_direction.h
+++ b/broker/gen/model/Detector_module_direction.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_power_state.cpp b/broker/gen/model/Detector_power_state.cpp
index 75eacf650..3b5f1f9d6 100644
--- a/broker/gen/model/Detector_power_state.cpp
+++ b/broker/gen/model/Detector_power_state.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_power_state.h b/broker/gen/model/Detector_power_state.h
index bee22e7aa..01f9686e5 100644
--- a/broker/gen/model/Detector_power_state.h
+++ b/broker/gen/model/Detector_power_state.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_selection.cpp b/broker/gen/model/Detector_selection.cpp
index e71c1c69f..0f583f8fe 100644
--- a/broker/gen/model/Detector_selection.cpp
+++ b/broker/gen/model/Detector_selection.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_selection.h b/broker/gen/model/Detector_selection.h
index 19f479669..8f4bfc5a2 100644
--- a/broker/gen/model/Detector_selection.h
+++ b/broker/gen/model/Detector_selection.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_settings.cpp b/broker/gen/model/Detector_settings.cpp
index 604f8c3e8..22e4f4514 100644
--- a/broker/gen/model/Detector_settings.cpp
+++ b/broker/gen/model/Detector_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_settings.h b/broker/gen/model/Detector_settings.h
index 853684b36..a86906614 100644
--- a/broker/gen/model/Detector_settings.h
+++ b/broker/gen/model/Detector_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_state.cpp b/broker/gen/model/Detector_state.cpp
index 420dce718..95d81e77a 100644
--- a/broker/gen/model/Detector_state.cpp
+++ b/broker/gen/model/Detector_state.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_state.h b/broker/gen/model/Detector_state.h
index 7d037feea..0ee174bbc 100644
--- a/broker/gen/model/Detector_state.h
+++ b/broker/gen/model/Detector_state.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_status.cpp b/broker/gen/model/Detector_status.cpp
index a2c01a338..a2591c1e1 100644
--- a/broker/gen/model/Detector_status.cpp
+++ b/broker/gen/model/Detector_status.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_status.h b/broker/gen/model/Detector_status.h
index 7d6f9f747..2276970d8 100644
--- a/broker/gen/model/Detector_status.h
+++ b/broker/gen/model/Detector_status.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_timing.cpp b/broker/gen/model/Detector_timing.cpp
index e3f5cdecc..0e0476bdc 100644
--- a/broker/gen/model/Detector_timing.cpp
+++ b/broker/gen/model/Detector_timing.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_timing.h b/broker/gen/model/Detector_timing.h
index 59cdfe075..87748b8e5 100644
--- a/broker/gen/model/Detector_timing.h
+++ b/broker/gen/model/Detector_timing.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_type.cpp b/broker/gen/model/Detector_type.cpp
index d367987a4..df6279433 100644
--- a/broker/gen/model/Detector_type.cpp
+++ b/broker/gen/model/Detector_type.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Detector_type.h b/broker/gen/model/Detector_type.h
index 60a5c7982..96651a3a5 100644
--- a/broker/gen/model/Detector_type.h
+++ b/broker/gen/model/Detector_type.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Error_message.cpp b/broker/gen/model/Error_message.cpp
index b3fa3b69f..ab7c86b2e 100644
--- a/broker/gen/model/Error_message.cpp
+++ b/broker/gen/model/Error_message.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Error_message.h b/broker/gen/model/Error_message.h
index a0876f85a..0d23f5bd2 100644
--- a/broker/gen/model/Error_message.h
+++ b/broker/gen/model/Error_message.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/File_writer_format.cpp b/broker/gen/model/File_writer_format.cpp
index e06441513..48717df55 100644
--- a/broker/gen/model/File_writer_format.cpp
+++ b/broker/gen/model/File_writer_format.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/File_writer_format.h b/broker/gen/model/File_writer_format.h
index 0e04f2b36..eea4760f4 100644
--- a/broker/gen/model/File_writer_format.h
+++ b/broker/gen/model/File_writer_format.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/File_writer_settings.cpp b/broker/gen/model/File_writer_settings.cpp
index 153092380..f2089ea95 100644
--- a/broker/gen/model/File_writer_settings.cpp
+++ b/broker/gen/model/File_writer_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/File_writer_settings.h b/broker/gen/model/File_writer_settings.h
index 63384b64d..dacd47a25 100644
--- a/broker/gen/model/File_writer_settings.h
+++ b/broker/gen/model/File_writer_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Fpga_status_inner.cpp b/broker/gen/model/Fpga_status_inner.cpp
index c61f451ef..c9661a933 100644
--- a/broker/gen/model/Fpga_status_inner.cpp
+++ b/broker/gen/model/Fpga_status_inner.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Fpga_status_inner.h b/broker/gen/model/Fpga_status_inner.h
index b0a381381..45c8a18f3 100644
--- a/broker/gen/model/Fpga_status_inner.h
+++ b/broker/gen/model/Fpga_status_inner.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Geom_refinement_algorithm.cpp b/broker/gen/model/Geom_refinement_algorithm.cpp
index cfff98b09..6057a0a68 100644
--- a/broker/gen/model/Geom_refinement_algorithm.cpp
+++ b/broker/gen/model/Geom_refinement_algorithm.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Geom_refinement_algorithm.h b/broker/gen/model/Geom_refinement_algorithm.h
index a25109eee..759a9d261 100644
--- a/broker/gen/model/Geom_refinement_algorithm.h
+++ b/broker/gen/model/Geom_refinement_algorithm.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Grid_scan.cpp b/broker/gen/model/Grid_scan.cpp
index 6c33f99dd..026d83a72 100644
--- a/broker/gen/model/Grid_scan.cpp
+++ b/broker/gen/model/Grid_scan.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Grid_scan.h b/broker/gen/model/Grid_scan.h
index eab623afb..a2e890036 100644
--- a/broker/gen/model/Grid_scan.h
+++ b/broker/gen/model/Grid_scan.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Helpers.cpp b/broker/gen/model/Helpers.cpp
index 10c879e1f..4519b4aa1 100644
--- a/broker/gen/model/Helpers.cpp
+++ b/broker/gen/model/Helpers.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Helpers.h b/broker/gen/model/Helpers.h
index e3fb3f42d..b59d98d66 100644
--- a/broker/gen/model/Helpers.h
+++ b/broker/gen/model/Helpers.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Image_buffer_status.cpp b/broker/gen/model/Image_buffer_status.cpp
index a094124cc..32622bf41 100644
--- a/broker/gen/model/Image_buffer_status.cpp
+++ b/broker/gen/model/Image_buffer_status.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Image_buffer_status.h b/broker/gen/model/Image_buffer_status.h
index 6a983afdb..42ee7cb4f 100644
--- a/broker/gen/model/Image_buffer_status.h
+++ b/broker/gen/model/Image_buffer_status.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Image_format_settings.cpp b/broker/gen/model/Image_format_settings.cpp
index 6fb1945af..0638cd8a2 100644
--- a/broker/gen/model/Image_format_settings.cpp
+++ b/broker/gen/model/Image_format_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Image_format_settings.h b/broker/gen/model/Image_format_settings.h
index 4a2f14646..e6a023ef0 100644
--- a/broker/gen/model/Image_format_settings.h
+++ b/broker/gen/model/Image_format_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Image_pusher_status.cpp b/broker/gen/model/Image_pusher_status.cpp
index 74195460b..2b9944d98 100644
--- a/broker/gen/model/Image_pusher_status.cpp
+++ b/broker/gen/model/Image_pusher_status.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Image_pusher_status.h b/broker/gen/model/Image_pusher_status.h
index 2eaf6a6cf..a7b153bbf 100644
--- a/broker/gen/model/Image_pusher_status.h
+++ b/broker/gen/model/Image_pusher_status.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Image_pusher_type.cpp b/broker/gen/model/Image_pusher_type.cpp
index 94ec38dd0..d2bb3fe41 100644
--- a/broker/gen/model/Image_pusher_type.cpp
+++ b/broker/gen/model/Image_pusher_type.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Image_pusher_type.h b/broker/gen/model/Image_pusher_type.h
index fee7c3ae4..1c02e4f05 100644
--- a/broker/gen/model/Image_pusher_type.h
+++ b/broker/gen/model/Image_pusher_type.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Indexing_algorithm.cpp b/broker/gen/model/Indexing_algorithm.cpp
index c854864d4..52a009255 100644
--- a/broker/gen/model/Indexing_algorithm.cpp
+++ b/broker/gen/model/Indexing_algorithm.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Indexing_algorithm.h b/broker/gen/model/Indexing_algorithm.h
index c4e74345e..18e3e067f 100644
--- a/broker/gen/model/Indexing_algorithm.h
+++ b/broker/gen/model/Indexing_algorithm.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Indexing_settings.cpp b/broker/gen/model/Indexing_settings.cpp
index 6722391ab..f13a584dc 100644
--- a/broker/gen/model/Indexing_settings.cpp
+++ b/broker/gen/model/Indexing_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Indexing_settings.h b/broker/gen/model/Indexing_settings.h
index f3db45c3b..4294a02da 100644
--- a/broker/gen/model/Indexing_settings.h
+++ b/broker/gen/model/Indexing_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Instrument_metadata.cpp b/broker/gen/model/Instrument_metadata.cpp
index 54a0591cd..5932b2655 100644
--- a/broker/gen/model/Instrument_metadata.cpp
+++ b/broker/gen/model/Instrument_metadata.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Instrument_metadata.h b/broker/gen/model/Instrument_metadata.h
index a48c79c60..a06bd256a 100644
--- a/broker/gen/model/Instrument_metadata.h
+++ b/broker/gen/model/Instrument_metadata.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Integration_model.cpp b/broker/gen/model/Integration_model.cpp
index 0c77a6ba4..c7599e560 100644
--- a/broker/gen/model/Integration_model.cpp
+++ b/broker/gen/model/Integration_model.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Integration_model.h b/broker/gen/model/Integration_model.h
index 14f435a1f..26c818380 100644
--- a/broker/gen/model/Integration_model.h
+++ b/broker/gen/model/Integration_model.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Jfjoch_settings.cpp b/broker/gen/model/Jfjoch_settings.cpp
index 4229f32c2..b1b23403e 100644
--- a/broker/gen/model/Jfjoch_settings.cpp
+++ b/broker/gen/model/Jfjoch_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Jfjoch_settings.h b/broker/gen/model/Jfjoch_settings.h
index 334d68db9..2bee8c532 100644
--- a/broker/gen/model/Jfjoch_settings.h
+++ b/broker/gen/model/Jfjoch_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Jfjoch_statistics.cpp b/broker/gen/model/Jfjoch_statistics.cpp
index f95ef99c4..fa9218455 100644
--- a/broker/gen/model/Jfjoch_statistics.cpp
+++ b/broker/gen/model/Jfjoch_statistics.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Jfjoch_statistics.h b/broker/gen/model/Jfjoch_statistics.h
index e7636ae80..8705e77c5 100644
--- a/broker/gen/model/Jfjoch_statistics.h
+++ b/broker/gen/model/Jfjoch_statistics.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Measurement_statistics.cpp b/broker/gen/model/Measurement_statistics.cpp
index 67504d793..1ce34d5c9 100644
--- a/broker/gen/model/Measurement_statistics.cpp
+++ b/broker/gen/model/Measurement_statistics.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Measurement_statistics.h b/broker/gen/model/Measurement_statistics.h
index 7b3e6e99c..92daacffc 100644
--- a/broker/gen/model/Measurement_statistics.h
+++ b/broker/gen/model/Measurement_statistics.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Pcie_devices_inner.cpp b/broker/gen/model/Pcie_devices_inner.cpp
index 078aba614..4690f6398 100644
--- a/broker/gen/model/Pcie_devices_inner.cpp
+++ b/broker/gen/model/Pcie_devices_inner.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Pcie_devices_inner.h b/broker/gen/model/Pcie_devices_inner.h
index c180a8b77..8c7948280 100644
--- a/broker/gen/model/Pcie_devices_inner.h
+++ b/broker/gen/model/Pcie_devices_inner.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Pixel_mask_statistics.cpp b/broker/gen/model/Pixel_mask_statistics.cpp
index db58b840d..0d4f29518 100644
--- a/broker/gen/model/Pixel_mask_statistics.cpp
+++ b/broker/gen/model/Pixel_mask_statistics.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Pixel_mask_statistics.h b/broker/gen/model/Pixel_mask_statistics.h
index f58657baf..b35a98f1a 100644
--- a/broker/gen/model/Pixel_mask_statistics.h
+++ b/broker/gen/model/Pixel_mask_statistics.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Plot.cpp b/broker/gen/model/Plot.cpp
index c6eae9869..054cd25f5 100644
--- a/broker/gen/model/Plot.cpp
+++ b/broker/gen/model/Plot.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Plot.h b/broker/gen/model/Plot.h
index 05a92fa44..2b3ab8f97 100644
--- a/broker/gen/model/Plot.h
+++ b/broker/gen/model/Plot.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Plot_unit_x.cpp b/broker/gen/model/Plot_unit_x.cpp
index 714fbbdcc..87fdc01d7 100644
--- a/broker/gen/model/Plot_unit_x.cpp
+++ b/broker/gen/model/Plot_unit_x.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Plot_unit_x.h b/broker/gen/model/Plot_unit_x.h
index 527cd956d..c98ad0332 100644
--- a/broker/gen/model/Plot_unit_x.h
+++ b/broker/gen/model/Plot_unit_x.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Plots.cpp b/broker/gen/model/Plots.cpp
index 5b77f98f5..f84c8af2a 100644
--- a/broker/gen/model/Plots.cpp
+++ b/broker/gen/model/Plots.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Plots.h b/broker/gen/model/Plots.h
index bb239c65b..0979b2748 100644
--- a/broker/gen/model/Plots.h
+++ b/broker/gen/model/Plots.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Powder_calibration_fit_sigma.cpp b/broker/gen/model/Powder_calibration_fit_sigma.cpp
index be796ea46..4ed043528 100644
--- a/broker/gen/model/Powder_calibration_fit_sigma.cpp
+++ b/broker/gen/model/Powder_calibration_fit_sigma.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Powder_calibration_fit_sigma.h b/broker/gen/model/Powder_calibration_fit_sigma.h
index 5a6dceeda..afe19f90c 100644
--- a/broker/gen/model/Powder_calibration_fit_sigma.h
+++ b/broker/gen/model/Powder_calibration_fit_sigma.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Powder_calibration_output.cpp b/broker/gen/model/Powder_calibration_output.cpp
index 4ee18d578..bcaf385c5 100644
--- a/broker/gen/model/Powder_calibration_output.cpp
+++ b/broker/gen/model/Powder_calibration_output.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Powder_calibration_output.h b/broker/gen/model/Powder_calibration_output.h
index 657399686..931194659 100644
--- a/broker/gen/model/Powder_calibration_output.h
+++ b/broker/gen/model/Powder_calibration_output.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Powder_calibration_quality.cpp b/broker/gen/model/Powder_calibration_quality.cpp
index 878cce2c9..aa934e59b 100644
--- a/broker/gen/model/Powder_calibration_quality.cpp
+++ b/broker/gen/model/Powder_calibration_quality.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Powder_calibration_quality.h b/broker/gen/model/Powder_calibration_quality.h
index b1822d9c2..7dd0f8804 100644
--- a/broker/gen/model/Powder_calibration_quality.h
+++ b/broker/gen/model/Powder_calibration_quality.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Powder_calibration_spot_check.cpp b/broker/gen/model/Powder_calibration_spot_check.cpp
index 514ac8544..030f65f36 100644
--- a/broker/gen/model/Powder_calibration_spot_check.cpp
+++ b/broker/gen/model/Powder_calibration_spot_check.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Powder_calibration_spot_check.h b/broker/gen/model/Powder_calibration_spot_check.h
index 487edac93..8818444c9 100644
--- a/broker/gen/model/Powder_calibration_spot_check.h
+++ b/broker/gen/model/Powder_calibration_spot_check.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_azim_list.cpp b/broker/gen/model/Roi_azim_list.cpp
index 54ddd7ef7..4d28f06b1 100644
--- a/broker/gen/model/Roi_azim_list.cpp
+++ b/broker/gen/model/Roi_azim_list.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_azim_list.h b/broker/gen/model/Roi_azim_list.h
index 9385256e1..71e16a934 100644
--- a/broker/gen/model/Roi_azim_list.h
+++ b/broker/gen/model/Roi_azim_list.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_azimuthal.cpp b/broker/gen/model/Roi_azimuthal.cpp
index a2a0c67fb..a554eacc7 100644
--- a/broker/gen/model/Roi_azimuthal.cpp
+++ b/broker/gen/model/Roi_azimuthal.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_azimuthal.h b/broker/gen/model/Roi_azimuthal.h
index c1f7f3225..c4cf9242c 100644
--- a/broker/gen/model/Roi_azimuthal.h
+++ b/broker/gen/model/Roi_azimuthal.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_box.cpp b/broker/gen/model/Roi_box.cpp
index e207102c1..0202f5a6c 100644
--- a/broker/gen/model/Roi_box.cpp
+++ b/broker/gen/model/Roi_box.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_box.h b/broker/gen/model/Roi_box.h
index 15269f074..353217f9d 100644
--- a/broker/gen/model/Roi_box.h
+++ b/broker/gen/model/Roi_box.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_box_list.cpp b/broker/gen/model/Roi_box_list.cpp
index 7ad037251..f4ceb8270 100644
--- a/broker/gen/model/Roi_box_list.cpp
+++ b/broker/gen/model/Roi_box_list.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_box_list.h b/broker/gen/model/Roi_box_list.h
index b4a1c7999..e253f02af 100644
--- a/broker/gen/model/Roi_box_list.h
+++ b/broker/gen/model/Roi_box_list.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_circle.cpp b/broker/gen/model/Roi_circle.cpp
index 0454a0c71..0a8013055 100644
--- a/broker/gen/model/Roi_circle.cpp
+++ b/broker/gen/model/Roi_circle.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_circle.h b/broker/gen/model/Roi_circle.h
index fabf13f65..d4f11d94c 100644
--- a/broker/gen/model/Roi_circle.h
+++ b/broker/gen/model/Roi_circle.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_circle_list.cpp b/broker/gen/model/Roi_circle_list.cpp
index 99f37ca62..83873dd6b 100644
--- a/broker/gen/model/Roi_circle_list.cpp
+++ b/broker/gen/model/Roi_circle_list.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_circle_list.h b/broker/gen/model/Roi_circle_list.h
index 36ab33450..de1f3c3f1 100644
--- a/broker/gen/model/Roi_circle_list.h
+++ b/broker/gen/model/Roi_circle_list.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_definitions.cpp b/broker/gen/model/Roi_definitions.cpp
index 9d2209bfa..4cc6685c1 100644
--- a/broker/gen/model/Roi_definitions.cpp
+++ b/broker/gen/model/Roi_definitions.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Roi_definitions.h b/broker/gen/model/Roi_definitions.h
index 3ac24142a..b905d4285 100644
--- a/broker/gen/model/Roi_definitions.h
+++ b/broker/gen/model/Roi_definitions.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Rotation_axis.cpp b/broker/gen/model/Rotation_axis.cpp
index 146ab157f..9cb1eb451 100644
--- a/broker/gen/model/Rotation_axis.cpp
+++ b/broker/gen/model/Rotation_axis.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Rotation_axis.h b/broker/gen/model/Rotation_axis.h
index 019167e4a..8bba40029 100644
--- a/broker/gen/model/Rotation_axis.h
+++ b/broker/gen/model/Rotation_axis.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Scan_result.cpp b/broker/gen/model/Scan_result.cpp
index e8a2fa7ab..8682f7341 100644
--- a/broker/gen/model/Scan_result.cpp
+++ b/broker/gen/model/Scan_result.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Scan_result.h b/broker/gen/model/Scan_result.h
index fb2975ee0..878e2ac82 100644
--- a/broker/gen/model/Scan_result.h
+++ b/broker/gen/model/Scan_result.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Scan_result_images_inner.cpp b/broker/gen/model/Scan_result_images_inner.cpp
index 1ada678da..22d01f540 100644
--- a/broker/gen/model/Scan_result_images_inner.cpp
+++ b/broker/gen/model/Scan_result_images_inner.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Scan_result_images_inner.h b/broker/gen/model/Scan_result_images_inner.h
index 0af48f152..87327066a 100644
--- a/broker/gen/model/Scan_result_images_inner.h
+++ b/broker/gen/model/Scan_result_images_inner.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Spot_finding_settings.cpp b/broker/gen/model/Spot_finding_settings.cpp
index e4e0bd0b6..316969f19 100644
--- a/broker/gen/model/Spot_finding_settings.cpp
+++ b/broker/gen/model/Spot_finding_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Spot_finding_settings.h b/broker/gen/model/Spot_finding_settings.h
index 771a7bd6f..c506ff84b 100644
--- a/broker/gen/model/Spot_finding_settings.h
+++ b/broker/gen/model/Spot_finding_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Standard_detector_geometry.cpp b/broker/gen/model/Standard_detector_geometry.cpp
index d6b50b6ea..e8242eb5f 100644
--- a/broker/gen/model/Standard_detector_geometry.cpp
+++ b/broker/gen/model/Standard_detector_geometry.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Standard_detector_geometry.h b/broker/gen/model/Standard_detector_geometry.h
index 3db1b5c42..7e72433bb 100644
--- a/broker/gen/model/Standard_detector_geometry.h
+++ b/broker/gen/model/Standard_detector_geometry.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Tcp_settings.cpp b/broker/gen/model/Tcp_settings.cpp
index 97e6fa6ee..638fd8fa7 100644
--- a/broker/gen/model/Tcp_settings.cpp
+++ b/broker/gen/model/Tcp_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Tcp_settings.h b/broker/gen/model/Tcp_settings.h
index 3b619f00e..c32590a26 100644
--- a/broker/gen/model/Tcp_settings.h
+++ b/broker/gen/model/Tcp_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Unit_cell.cpp b/broker/gen/model/Unit_cell.cpp
index 7df9c616f..58bb84bb5 100644
--- a/broker/gen/model/Unit_cell.cpp
+++ b/broker/gen/model/Unit_cell.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Unit_cell.h b/broker/gen/model/Unit_cell.h
index 65c3a637d..08b368707 100644
--- a/broker/gen/model/Unit_cell.h
+++ b/broker/gen/model/Unit_cell.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Zeromq_metadata_settings.cpp b/broker/gen/model/Zeromq_metadata_settings.cpp
index a2f33c388..73438e408 100644
--- a/broker/gen/model/Zeromq_metadata_settings.cpp
+++ b/broker/gen/model/Zeromq_metadata_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Zeromq_metadata_settings.h b/broker/gen/model/Zeromq_metadata_settings.h
index 34f08d6e9..1e86055a6 100644
--- a/broker/gen/model/Zeromq_metadata_settings.h
+++ b/broker/gen/model/Zeromq_metadata_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Zeromq_preview_settings.cpp b/broker/gen/model/Zeromq_preview_settings.cpp
index 1b7a4d102..a5565d3ab 100644
--- a/broker/gen/model/Zeromq_preview_settings.cpp
+++ b/broker/gen/model/Zeromq_preview_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Zeromq_preview_settings.h b/broker/gen/model/Zeromq_preview_settings.h
index 8bb528f1a..e1a2554d9 100644
--- a/broker/gen/model/Zeromq_preview_settings.h
+++ b/broker/gen/model/Zeromq_preview_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Zeromq_settings.cpp b/broker/gen/model/Zeromq_settings.cpp
index 0e0575a8e..d01e89589 100644
--- a/broker/gen/model/Zeromq_settings.cpp
+++ b/broker/gen/model/Zeromq_settings.cpp
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/gen/model/Zeromq_settings.h b/broker/gen/model/Zeromq_settings.h
index a5a4fbe3c..2c004251d 100644
--- a/broker/gen/model/Zeromq_settings.h
+++ b/broker/gen/model/Zeromq_settings.h
@@ -2,7 +2,7 @@
 * Jungfraujoch
 * API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland). Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU. Jungfraujoch uses FPGA boards to acquire data at high data rates.  # License Clarification  While this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply** when this file is used solely to generate OpenAPI clients or when implementing applications that interact with the API. Generated client code and applications using this API definition are not subject to the GPL license requirements and may be distributed under terms of your choosing.  This exception is similar in spirit to the Linux Kernel's approach to userspace API headers and the GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that user programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not derivative works of the kernel and are not subject to the terms of the GPL.  This exception is intended to allow wider use of this API specification without imposing GPL requirements on applications that merely interact with the API, regardless of whether they communicate through network calls or other mechanisms. 
 *
-* The version of the OpenAPI document: 1.0.0-rc.168
+* The version of the OpenAPI document: 1.0.0-rc.169
 * Contact: filip.leonarski@psi.ch
 *
 * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/broker/jfjoch_api.yaml b/broker/jfjoch_api.yaml
index 4417a618c..cfc9379bb 100644
--- a/broker/jfjoch_api.yaml
+++ b/broker/jfjoch_api.yaml
@@ -22,7 +22,7 @@ info:
     requirements on applications that merely interact with the API, regardless of whether they
     communicate through network calls or other mechanisms.
 
-  version: 1.0.0-rc.168
+  version: 1.0.0-rc.169
   contact:
     name: Filip Leonarski (Paul Scherrer Institute)
     email: filip.leonarski@psi.ch
diff --git a/broker/redoc-static.html b/broker/redoc-static.html
index c66989964..a244747af 100644
--- a/broker/redoc-static.html
+++ b/broker/redoc-static.html
@@ -399,7 +399,7 @@ This format doesn&#x27;t transmit information about X-axis, only values, so it i
           55.627 l 55.6165,55.627 -231.245496,231.24803 c -127.185,127.1864
           -231.5279,231.248 -231.873,231.248 -0.3451,0 -104.688,
           -104.0616 -231.873,-231.248 z
-        " fill="currentColor"></path></g></svg></div></div><div class="sc-eulNck iEaKWZ api-content"><div class="sc-dcJsrY bBkGhy"><div class="sc-kAyceB hBQWIZ"><div class="sc-fqkvVR oJKYx api-info"><h1 class="sc-imWYAI sc-ktJbId cILgPb UQJzT">Jungfraujoch<!-- --> <span>(<!-- -->1.0.0-rc.168<!-- -->)</span></h1><p>Download OpenAPI specification<!-- -->:</p><div class="sc-eeDRCY sc-eBMEME gTGgei fMmru"><div class="sc-fiCwlc iQovLz"><div class="sc-jIGnZt cKLRU"><span class="sc-kMkxaj csEIgT">Filip Leonarski (Paul Scherrer Institute)<!-- -->:<!-- --> <a href="mailto:filip.leonarski@psi.ch">filip.leonarski@psi.ch</a></span> <!-- --> <span class="sc-kMkxaj csEIgT">License:<!-- --> <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPL-3.0</a></span> </div></div></div><div class="sc-eeDRCY sc-eBMEME gTGgei fMmru" data-role="redoc-summary"></div><div class="sc-eeDRCY sc-eBMEME gTGgei fMmru" data-role="redoc-description"><p>API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland).
+        " fill="currentColor"></path></g></svg></div></div><div class="sc-eulNck iEaKWZ api-content"><div class="sc-dcJsrY bBkGhy"><div class="sc-kAyceB hBQWIZ"><div class="sc-fqkvVR oJKYx api-info"><h1 class="sc-imWYAI sc-ktJbId cILgPb UQJzT">Jungfraujoch<!-- --> <span>(<!-- -->1.0.0-rc.169<!-- -->)</span></h1><p>Download OpenAPI specification<!-- -->:</p><div class="sc-eeDRCY sc-eBMEME gTGgei fMmru"><div class="sc-fiCwlc iQovLz"><div class="sc-jIGnZt cKLRU"><span class="sc-kMkxaj csEIgT">Filip Leonarski (Paul Scherrer Institute)<!-- -->:<!-- --> <a href="mailto:filip.leonarski@psi.ch">filip.leonarski@psi.ch</a></span> <!-- --> <span class="sc-kMkxaj csEIgT">License:<!-- --> <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPL-3.0</a></span> </div></div></div><div class="sc-eeDRCY sc-eBMEME gTGgei fMmru" data-role="redoc-summary"></div><div class="sc-eeDRCY sc-eBMEME gTGgei fMmru" data-role="redoc-description"><p>API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland).
 Jungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU.
 Jungfraujoch uses FPGA boards to acquire data at high data rates.</p>
 </div></div></div></div><div id="section/License-Clarification" data-section-id="section/License-Clarification" class="sc-dcJsrY bBkGhy"><div class="sc-kAyceB hBQWIZ"><div class="sc-fqkvVR oJKYx"><h2 class="sc-jXbUNg fWnwAh"><a class="sc-jlZhew kbdRLs" href="#section/License-Clarification" aria-label="section/License-Clarification"></a>License Clarification</h2></div></div><div class="sc-fqkvVR diIqQJ"><div class="sc-eeDRCY sc-eBMEME gTGgei fMmru redoc-markdown "><p>While this API definition is licensed under GPL-3.0, <strong>the GPL copyleft provisions do not apply</strong>
@@ -996,7 +996,7 @@ then image might be replaced in the buffer between calling /images and /image.cb
 </div></button></div></div></div><div class="sc-iGgWBj sc-gsFSXq ibAZSi eDeKjd"><div class="sc-ejfMa-d bNUPQg"><button class="sc-EgOXT cFEcOl"><span type="get" class="sc-eZYNyq qGfV http-verb get">get</span><span class="sc-iEXKAA gUNSDu">/version</span><svg class="sc-cwHptR iVFMLx" style="margin-right:-25px" version="1.1" viewBox="0 0 24 24" x="0" xmlns="http://www.w3.org/2000/svg" y="0" aria-hidden="true"><polygon points="17.3 8.3 12 13.6 6.7 8.3 5.3 9.7 12 16.4 18.7 9.7 "></polygon></svg></button><div aria-hidden="true" class="sc-dlWCHZ kWacYr"><div class="sc-hHOBiw cndTNO"><div class="sc-eeDRCY sc-eBMEME gTGgei fbXBig"><p>Test Jungfraujoch system</p>
 </div><div tabindex="0" role="button"><div class="sc-kWtpeL gEncxT"><span>http://localhost:5232</span>/version</div></div></div></div></div></div></div></div></div><div class="sc-dExYaf gZbfaQ"></div></div></div>
       <script>
-      const __redoc_state = {"menu":{"activeItemIdx":-1},"spec":{"data":{"openapi":"3.0.3","info":{"title":"Jungfraujoch","description":"API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland).\nJungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU.\nJungfraujoch uses FPGA boards to acquire data at high data rates.\n\n# License Clarification\n\nWhile this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply**\nwhen this file is used solely to generate OpenAPI clients or when implementing applications that\ninteract with the API. Generated client code and applications using this API definition are not\nsubject to the GPL license requirements and may be distributed under terms of your choosing.\n\nThis exception is similar in spirit to the Linux Kernel's approach to userspace API headers and\nthe GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that\nuser programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not\nderivative works of the kernel and are not subject to the terms of the GPL.\n\nThis exception is intended to allow wider use of this API specification without imposing GPL\nrequirements on applications that merely interact with the API, regardless of whether they\ncommunicate through network calls or other mechanisms.\n","version":"1.0.0-rc.168","contact":{"name":"Filip Leonarski (Paul Scherrer Institute)","email":"filip.leonarski@psi.ch"},"license":{"name":"GPL-3.0","url":"https://www.gnu.org/licenses/gpl-3.0.html"}},"servers":[{"url":"http://localhost:5232","description":"Test Jungfraujoch system"}],"components":{"parameters":{"binning":{"in":"query","name":"binning","required":false,"schema":{"default":1,"type":"integer"},"description":"Binning of frames for the plot (0 = default binning)"},"experimental_coord":{"in":"query","name":"experimental_coord","required":false,"schema":{"type":"boolean","default":false},"description":"If measurement has goniometer axis defined, plot X-axis will represent rotation angle\nIf measurement has grid scan defined, plot X-axis and Y-axis will represent grid position, Z will be used as the final value\nFor still measurement the number is ignored\n"},"azint_unit":{"in":"query","name":"azint_unit","required":false,"schema":{"type":"string","enum":["Q_recipA","d_A","two_theta_deg"],"default":"Q_recipA"},"description":"Unit used for azim int.\n"},"fill_value":{"in":"query","name":"fill","required":false,"schema":{"type":"number","format":"float"},"description":"Fill value for elements that were missed during data collection\n"},"plot_type":{"in":"query","name":"type","required":true,"description":"Type of requested plot","schema":{"type":"string","enum":["bkg_estimate","spindle_blind_fraction","azint","azint_1d","spot_count","spot_count_low_res","spot_count_indexed","spot_count_ice","indexing_rate","indexing_lattice_count","indexing_unit_cell_length","indexing_unit_cell_angle","profile_radius","mosaicity","b_factor","error_pixels","saturated_pixels","image_collection_efficiency","receiver_delay","receiver_free_send_buf","strong_pixels","roi_sum","roi_mean","roi_max_count","roi_pixels","roi_weighted_x","roi_weighted_y","packets_received","max_pixel_value","resolution_estimate","pixel_sum","processing_time","beam_center_x","beam_center_y","integrated_reflections","image_scale_factor","image_scale_cc","compression_ratio","ice_ring_score"]}},"roi":{"in":"query","name":"roi","required":false,"schema":{"type":"string","minLength":1},"description":"Name of ROI for which plot is requested"},"image_id":{"in":"query","name":"id","required":false,"schema":{"type":"integer","format":"int64","default":-1,"minimum":-2},"description":"Image ID in the image buffer. Special values: -1 - last image in the buffer, -2: last indexed image in the buffer"},"saturation":{"in":"query","name":"saturation","required":false,"schema":{"type":"number","format":"float","minimum":-32767,"maximum":32767},"description":"Saturation value to set contrast in the preview image; if not provided, then autocontrast procedure is used"},"background":{"in":"query","name":"background","required":false,"schema":{"type":"number","format":"float","default":0,"minimum":-32767,"maximum":32767},"description":"Background value to set contrast in the preview image"},"show_spots":{"in":"query","name":"show_spots","schema":{"type":"boolean","default":true},"description":"Show spot finding results on the image"},"show_predictions":{"in":"query","name":"show_predictions","schema":{"type":"boolean","default":false},"description":"Show Bragg spot predictions on the image (if available for the image)"},"show_beam_center":{"in":"query","name":"show_beam_center","schema":{"type":"boolean","default":true},"description":"Show beam center on the image"},"show_roi":{"in":"query","name":"show_roi","schema":{"type":"boolean","default":false},"description":"Show ROI areas on the image"},"jpeg_quality":{"in":"query","name":"jpeg_quality","description":"Quality of JPEG image (100 - highest; 0 - lowest)","schema":{"type":"integer","format":"int64","default":100,"minimum":0,"maximum":100}},"show_user_mask":{"in":"query","name":"show_user_mask","schema":{"type":"boolean","default":false},"description":"Show user mask"},"resolution_ring":{"in":"query","name":"show_res_ring","description":"Show resolution ring, provided in Angstrom","schema":{"type":"number","format":"float","default":0.1,"minimum":0.1,"maximum":100}},"resolution_estimate":{"in":"query","name":"show_res_est","description":"Show resolution estimation as a ring","schema":{"type":"boolean","default":false}},"color_scale":{"in":"query","name":"color","description":"Color scale for preview image","schema":{"type":"string","enum":["indigo","viridis","bw","wb","green","heat","magma","inferno"],"default":"indigo"}}},"schemas":{"grid_scan":{"description":"Definition of a grid scan. Combine it with a goniometer axis to state the angle the spindle\nstood at: send `goniometer` with `step` 0 and the `start` angle of the grid scan, and that\nangle is written per image into the NXmx sample transformation chain. Without one the\nspindle is recorded at 0, which says that nobody stated an angle rather than that the\nspindle stood at 0.\n","type":"object","required":["n_fast","step_x_um","step_y_um"],"properties":{"n_fast":{"type":"integer","format":"int64","minimum":1,"example":20,"description":"Number of elements in the fast direction"},"step_x_um":{"type":"number","format":"float","example":5,"description":"Step in grid along the fast direction. Can be negative. \nPositive number: left to right\nNegative number: right to left\n"},"step_y_um":{"type":"number","format":"float","example":-3,"description":"Step in grid along the slow direction. Can be negative. \nPositive number: top to bottom\nNegative number: bottom to top\n"},"vertical":{"type":"boolean","default":false,"description":"If disabled: fast direction = X, slow direction = Y\nIf enabled: fast direction = Y, slow direction = X\n"},"snake":{"type":"boolean","default":false,"description":"Flip fast direction for every second row\n"}}},"rotation_axis":{"description":"Definition of a crystal rotation axis","type":"object","required":["step","vector"],"properties":{"name":{"type":"string","default":"omega","minLength":1,"description":"Name of rotation axis (e.g., omega, phi)"},"step":{"type":"number","format":"float","example":0.1,"description":"Angle step (per image) in degrees. 0 for an axis that does not turn: the axis then\nrecords the angle the spindle stood at, which is how a grid scan or a set of stills\nstates its head position.\n"},"start":{"type":"number","format":"float","example":50,"description":"Start angle in degrees","default":0},"vector":{"type":"array","description":"Rotation axis","example":[1,0,0],"items":{"type":"number","format":"float"},"minItems":3,"maxItems":3},"helical_step_um":{"type":"array","description":"Translation (per image) for helical scan","example":[-5,-2,0],"items":{"type":"number","format":"float"},"minItems":3,"maxItems":3},"screening_wedge_deg":{"type":"number","format":"float","description":"Wedge angle value; used if rotation per image is smaller than increment between images (so particularly in screening)"}}},"indexing_algorithm":{"type":"string","description":"Selection of an indexing algorithm used by Jungfraujoch\n","enum":["FFBIDX","FFT","FFTW","Auto","None"],"default":"FFBIDX"},"geom_refinement_algorithm":{"type":"string","description":"Selection of an post-indexing least-square diffraction geometry refinement algorithm used by Jungfraujoch.\nBeamCenter - This option is refining both beam center and lattice (restricted to a chosen/detected Bravais lattice).\nOrientationOnly - This option is refining only orientation of the lattice.\nFlex - Tries all per-image refinements and keeps whichever indexes the most spots, letting the pipeline decide (the rugnux flex mode).\n","enum":["BeamCenter","OrientationOnly","Flex","None"]},"integration_model":{"type":"string","description":"Bragg spot integration model.\nProfileGaussian - profile fit with a measured-width Gaussian (Kabsch-style), the default; more\n  accurate intensities than box summation.\nProfileEmpirical - profile fit with a per-resolution-shell empirical profile learned from strong spots.\nBoxSum - classical uniform box summation minus a ring-mean background; the simpler, faster fallback.\n","enum":["ProfileGaussian","ProfileEmpirical","BoxSum"],"default":"ProfileGaussian"},"dataset_settings":{"type":"object","required":["beam_x_pxl","beam_y_pxl","detector_distance_mm","incident_energy_keV"],"properties":{"images_per_trigger":{"type":"integer","format":"int64","minimum":1,"default":1,"description":"For standard synchrotron data collection - this is number of images collected per one TTL trigger\nFor XFEL (pulsed source) - this number is ignored and set to 1\nFor storage cell mode - this number is ignored and set to number of storage cells\n"},"ntrigger":{"type":"integer","format":"int64","default":1,"minimum":1,"description":"Number of TTL trigger that the detector is expected to receive during data collection\n"},"image_time_us":{"type":"integer","format":"int64","minimum":0,"description":"Image time. \nIf not provided (or zero value) the frame time is assumed as default.\nFor JUNGFRAU image time must be multiple of frame time and max value is 256 * frame_time.            \nIn XFEL mode: summation happens for frames collected with multiple triggers.\nIgnored for storage cells and if raw data are saved.\n"},"beam_x_pxl":{"type":"number","format":"float","description":"/entry/detector/beam_center_x in NXmx\nBeam center in X direction [pixels]\n"},"beam_y_pxl":{"type":"number","format":"float","description":"/entry/detector/beam_center_y in NXmx\nBeam center in X direction [pixels]\n"},"detector_distance_mm":{"type":"number","format":"float","minimum":0,"description":"/entry/detector/distance in NXmx Detector distance [mm]"},"incident_energy_keV":{"type":"number","format":"float","minimum":0.001,"maximum":500,"description":"Used to calculate /entry/beam/incident_wavelength in NXmx\nIncident particle (photon, electron) energy in keV\n"},"file_prefix":{"type":"string","default":"","description":"Prefix for filenames. If left empty, no file will be saved."},"images_per_file":{"type":"integer","format":"int64","minimum":1,"description":"Number of images in a single HDF5 data file, taken literally when given.\nIf omitted, it is chosen from the acquisition: a rotation sweep of at most 20000 images\ngoes into a single data file, so the dataset stays readable by programs that follow only\nthe first data file of a legacy master; a grid scan is split on a whole number of fast-axis\nrows; anything else (stills, serial) uses 1000.\n"},"space_group_number":{"type":"integer","format":"int64","minimum":1,"maximum":230,"description":"Number of space group for the crystal. Currently used solely as metadata, not relevant for image processing done in Jungfraujoch."},"sample_name":{"type":"string","default":"","description":"/entry/sample/name in NXmx\nSample name\n"},"compression":{"type":"string","enum":["bslz4","bszstd","bszstd_rle","bszstd_rlehuf","none"],"default":"bslz4","description":"Compression type for the images transferred over ZeroMQ and saved to HDF5 file.\n"},"total_flux":{"type":"number","format":"float","description":"/entry/beam/total_flux in NXmx\nFlux incident on beam plane in photons per second. In other words this is the flux integrated over area. [photons/s]\n"},"transmission":{"type":"number","format":"float","minimum":0,"maximum":1,"description":"/entry/instrument/attenuator/attenuator_transmission\nTransmission of attenuator (filter) [no units]\n"},"beam_size_x_um":{"type":"number","format":"float","minimum":0,"description":"First element of /entry/instrument/beam/incident_beam_size in NXmx\nHorizontal size of the X-ray beam where it meets the sample - the FWHM of a focused beam,\nthe full width of a slit-defined one. [um]\n"},"beam_size_y_um":{"type":"number","format":"float","minimum":0,"description":"Second element of /entry/instrument/beam/incident_beam_size in NXmx\nVertical size of the X-ray beam where it meets the sample. [um]\n"},"goniometer":{"$ref":"#/components/schemas/rotation_axis"},"grid_scan":{"$ref":"#/components/schemas/grid_scan"},"header_appendix":{"description":"Header appendix, added as user_data/user to start ZeroMQ message (can be any valid JSON)\nIn general, it is not saved in HDF5 file.\n\nHowever, if values are placed in \"hdf5\" object, `jfjoch_writer` will write them in /entry/user of the HDF5 file. \nThis applies solely to string and number (double floating-point). No arrays/sub-objects is allowed.\nFor example {\"hdf5\": {\"val1\":1, \"val2\":\"xyz\"}}, will write /entry/user/val1 and /entry/user/val2.\n"},"image_appendix":{"description":"Image appendix, added as user_data to image ZeroMQ message (can be any valid JSON)\nNot saved in HDF5 file\n"},"data_reduction_factor_serialmx":{"type":"number","format":"float","default":1,"minimum":0,"maximum":1,"description":"Rate at which non-indexed images are accepted to be forwarded to writer. \nValue of 1.0 (default) means that all images are written.\nValues below zero mean that non-indexed images will be accepted with a given probability.\n"},"pixel_value_low_threshold":{"type":"integer","format":"int64","minimum":0,"description":"Set all counts lower than the value to zero. \nWhen the value is set, negative numbers other than error pixel value are always set to zero.\nSetting to zero is equivalent to turning the option off.\n"},"run_number":{"type":"integer","format":"int64","minimum":0,"description":"Number of run within an experimental session. \nTransferred over CBOR stream as \"series ID\", though not saved in HDF5 file.\nIt is highly recommended to keep this number unique for each data collection during experimental series.\nIf not provided, the number will be automatically incremented.\n"},"run_name":{"type":"string","description":"Unique ID of run.\nTransferred over CBOR stream as \"unique series ID\", though not saved in HDF5 file.\nIt is highly recommended to keep this name unique for each data collection during experimental series.\nIf not provided, the name will be automatically generated as number + colon + file_prefix.\n"},"experiment_group":{"type":"string","description":"Name of group owning the data (e.g. p-group or proposal number). \nTransferred over CBOR stream, though not saved in HDF5 file.\n"},"poisson_compression":{"type":"integer","format":"int64","minimum":0,"maximum":16,"description":"Enable lossy compression of pixel values that preserves Poisson statistics. \nRequires to provide a numerical factor SQ.\nPixel value P will be transformed to round(sqrt(P) * SQ), with rounding to the closest integer.\nCompression is turned off if the value is missing or it is set to zero.\n"},"write_nxmx_hdf5_master":{"type":"boolean","default":true,"description":"Write NXmx formatted HDF5 master file. Recommended to use for macromolecular crystallography experiments\nand to turn off for other experiments.\n"},"save_calibration":{"type":"boolean","description":"Forward image calibration (at the moment pedestal and pedestal RMS for JUNGFRAU) using the ZeroMQ stream to writer.\nIf parameter is not provided calibration will be saved only if more than 4 images are recorded.\n"},"polarization_factor":{"type":"number","description":"Polarization factor for integration; 1.0 is horizontal polarization; -1.0 is vertical polarization","format":"float","minimum":-1,"maximum":1},"ring_current_mA":{"type":"number","format":"float","description":"Ring current at the beginning of the data collection","minimum":0},"sample_temperature_K":{"type":"number","format":"float","description":"Sample temperature in Kelvin","minimum":0},"poni_rot1_rad":{"type":"number","description":"PONI angle rot1 (see PyFAI documentation for details) in radians","format":"float","minimum":-6.28318530718,"maximum":6.28318530718,"default":0},"poni_rot2_rad":{"type":"number","description":"PONI angle rot2 (see PyFAI documentation for details) in radians","format":"float","minimum":-6.28318530718,"maximum":6.28318530718,"default":0},"poni_rot3_rad":{"type":"number","description":"PONI angle rot3 (see PyFAI documentation for details) in radians","format":"float","minimum":-6.28318530718,"maximum":6.28318530718,"default":0},"unit_cell":{"$ref":"#/components/schemas/unit_cell"},"spot_finding":{"type":"boolean","description":"Enable spot finding and save spots","default":true},"smargon":{"type":"object","description":"Geometry of Smargon goniometer at SLS 2.0 / MX beamlines. \nAssuming that Smargon is used as static positioner and not moving during the scan, allowing to reconstruct geometry.\n","required":["phi_deg","chi_deg"],"properties":{"phi_deg":{"type":"number","format":"float","description":"Phi angle in degrees"},"chi_deg":{"type":"number","format":"float","description":"Chi angle in degrees"},"phi_axis":{"type":"array","description":"Phi rotation axis","default":[1,0,0],"example":[1,0,0],"items":{"type":"number","format":"float"},"minItems":3,"maxItems":3},"chi_axis":{"type":"array","description":"Chi rotation axis","default":[0,0,1],"example":[0,0,1],"items":{"type":"number","format":"float"},"minItems":3,"maxItems":3}}},"max_spot_count":{"type":"integer","minimum":10,"maximum":2000,"default":250,"description":"Maximum number of spots that are saved/used for indexing; spots with highest intensity are selected"},"detect_ice_rings":{"type":"boolean","description":"Flag spots as ice rings and reduce their effect on indexing"},"async_start":{"type":"boolean","default":false,"description":"When set to true, `/start` will not wait for detector and Jungfraujoch to be ready for the measurement."},"xray_fluorescence_spectrum":{"type":"object","required":["energy_eV","data"],"properties":{"energy_eV":{"type":"array","items":{"type":"number","format":"float"},"description":"X-ray fluorescence scan energy for each measurement point"},"data":{"type":"array","items":{"type":"number","format":"float"},"description":"X-ray fluorescence scan result in arbitrary units; must be exactly the same length, as energy_eV"}}}}},"crystal_lattice":{"type":"array","items":{"type":"number","format":"float"},"minItems":9,"maxItems":9,"description":"Real-space crystal lattice 3D vectors in Angstrom.\nOrder is 1st vector (x,y,z), 2nd vector (x,y,z) and 3rd vector (x,y,z)\n"},"unit_cell":{"type":"object","description":"Unit cell parameters. Necessary to run indexing. Units of angstrom and degree","required":["a","b","c","alpha","beta","gamma"],"properties":{"a":{"type":"number","format":"float","example":37,"minimum":0},"b":{"type":"number","format":"float","example":37,"minimum":0},"c":{"type":"number","format":"float","example":78,"minimum":0},"alpha":{"type":"number","format":"float","example":90,"minimum":0,"maximum":360},"beta":{"type":"number","format":"float","example":90,"minimum":0,"maximum":360},"gamma":{"type":"number","format":"float","example":90,"minimum":0,"maximum":360}}},"file_writer_format":{"type":"string","enum":["NXmxOnlyData","NXmxLegacy","NXmxVDS","NXmxIntegrated","CBF","TIFF","NoFileWritten"],"default":"NXmxVDS","description":"NoFileWritten - no files are written at all\nNXmxOnlyData - only data files are written, no master file\nNXmxLegacy - legacy format with soft links to data files in the master file; necessary for DECTRIS Albula 4.0 and DECTRIS Neggia\nNXmxVDS - newer format with virtual dataset linking data files in the master file, also includes better metadata handling\nNXmxIntegrated - single HDF5 per dataset\nCBF - DEPRECATED, no longer supported; kept for back compatibility only. Requests using this value are rejected. Only HDF5 formats are written.\nTIFF - DEPRECATED, no longer supported; kept for back compatibility only. Requests using this value are rejected. Only HDF5 formats are written.\n"},"file_writer_settings":{"type":"object","properties":{"overwrite":{"type":"boolean","default":false,"description":"Inform jfjoch_write to overwrite existing files. Otherwise files would be saved with .h5.{timestamp}.tmp suffix.\n"},"format":{"$ref":"#/components/schemas/file_writer_format"}}},"pixel_mask_statistics":{"type":"object","properties":{"user_mask":{"description":"Number of pixels masked using the user mask","type":"integer","format":"int64","minimum":0},"too_high_pedestal_rms":{"description":"Number of pixels with G0 pedestal RMS higher than provided threshold","type":"integer","format":"int64","minimum":0},"wrong_gain":{"description":"Number of pixels that show wrong gain level during the pedestal procedure","type":"integer","format":"int64","minimum":0}}},"image_buffer_status":{"type":"object","required":["image_numbers","total_slots","in_preparation_slots","in_sending_slots","available_slots","max_image_number","min_image_number"],"properties":{"min_image_number":{"type":"integer","format":"int64","minimum":0,"description":"Smallest image number available in the buffer"},"max_image_number":{"type":"integer","format":"int64","minimum":0,"description":"Largest image number available in the buffer"},"image_numbers":{"type":"array","description":"Image numbers currently present in the buffer.","items":{"type":"integer","format":"int64"}},"total_slots":{"type":"integer","format":"int64","description":"Number of slots in the image buffer. This number, compared to number of images in data collection and\nframe rate will determine \"retention\" rate of the image buffer.\n"},"available_slots":{"type":"integer","format":"int64","description":"Slots available for the data collection"},"in_preparation_slots":{"type":"integer","format":"int64","description":"Number of slots in the image buffer that are currently in preparation for sending.\n"},"in_sending_slots":{"type":"integer","format":"int64","description":"Number of slots in the image buffer that are currently sending/writing data.\n"},"current_counter":{"type":"integer","format":"int64","description":"Counter of changes in the image buffer - either new start message or new image added.\nFor optimization one can only load new images/datasets from the HTTP if this value changes.\nCounter is optional as it was not implemented in older versions to avoid breaking change\n"}}},"image_format_settings":{"type":"object","required":["summation","jungfrau_conversion","geometry_transform","mask_chip_edges","mask_module_edges","apply_mask"],"properties":{"summation":{"type":"boolean","description":"Enable summation of images to a given image_time\nIf disabled images are saved according to original detector speed, but image count is adjusted\n"},"geometry_transform":{"type":"boolean","description":"Place module read-out into their location on composed detector and extend multipixels\n"},"jungfrau_conversion":{"type":"boolean","description":"Convert pixel value in ADU to photon counts/energy\nOnly affects JUNGFRAU detector\n"},"jungfrau_conversion_factor_keV":{"type":"number","format":"float","minimum":0.001,"maximum":500,"description":"Used to convert energy deposited into pixel to counts\nIf not provided incident_energy_keV is used\n"},"bit_depth_image":{"type":"integer","format":"int64","enum":[8,16,32],"description":"Bit depth of resulting image (it doesn't affect the detector read-out value)\nIf not provided value is adjusted automatically\n"},"signed_output":{"type":"boolean","description":"Controls if pixels have signed output\nIf not provided value is adjusted automatically\n"},"mask_module_edges":{"type":"boolean","default":true,"description":"Mask 1 pixel on the module boundary\n"},"mask_chip_edges":{"type":"boolean","default":true,"description":"Mask multipixels on chip boundary\n"},"jungfrau_mask_pixels_without_g0":{"type":"boolean","default":true,"description":"JUNGFRAU: mask pixels that don't operate in G0, but do operate in G1 and G1.\nThis should be turned off for cases, where detector is operated at room temperature with long exposure time.\n"},"apply_mask":{"type":"boolean","default":false,"description":"Masked pixels are set to special value in the images produced by Jungfraujoch\n"},"jungfrau_pedestal_g0_rms_limit":{"type":"integer","format":"int64","default":100,"minimum":0,"description":"Pixels with pedestal G0 RMS above the threshold are marked as masked pixels"}}},"detector_power_state":{"type":"string","description":"Power on of ASICs","enum":["PowerOn","PowerOff","Partial"]},"detector_state":{"type":"string","description":"Current state of the detector","enum":["Idle","Waiting","Busy","Error","Not connected"]},"detector_status":{"type":"object","required":["state","powerchip","server_version","number_of_triggers_left","fpga_temp_degC","high_voltage_V"],"properties":{"state":{"$ref":"#/components/schemas/detector_state"},"powerchip":{"$ref":"#/components/schemas/detector_power_state"},"server_version":{"type":"string","description":"Detector server (on read-out boards) version"},"number_of_triggers_left":{"type":"integer","format":"int64","description":"Remaining triggers to the detector (max of all modules)"},"fpga_temp_degC":{"type":"array","description":"Temperature of detector FPGAs","items":{"type":"integer","format":"int64"}},"high_voltage_V":{"type":"array","description":"High voltage for detector modules","items":{"type":"integer","format":"int64"}}}},"detector_timing":{"type":"string","enum":["auto","trigger","burst","gated"],"default":"trigger"},"detector_settings":{"type":"object","required":["frame_time_us"],"properties":{"frame_time_us":{"type":"integer","description":"Interval between consecutive frames.\nThis is internal frame time for the JUNGFRAU detector, image time has to be integer multiply of this number.\nFor EIGER detector this is default frame time, not used otherwise\n","format":"int64","minimum":1},"count_time_us":{"type":"integer","description":"Integration time of the detector. \nIf not provided count time will be set to maximum value for a given frame time.\n","format":"int64"},"internal_frame_generator":{"type":"boolean","default":false,"description":"Use internal frame generator in FPGA instead of getting data from a real detector"},"internal_frame_generator_images":{"type":"integer","format":"int64","default":1,"minimum":1,"maximum":64,"description":"Number of images stored in the internal frame generator."},"detector_trigger_delay_ns":{"type":"integer","format":"int64","minimum":0,"default":0,"description":"Delay between TTL trigger and acquisition start [ns]"},"timing":{"$ref":"#/components/schemas/detector_timing"},"eiger_threshold_keV":{"type":"number","format":"float","minimum":1,"maximum":100,"description":"Threshold for the PSI EIGER detector and all DECTRIS detectors.\nIf value is provided, it will be used for all subsequent acquisitions, irrespective of beam energy.\nIf value is not provided, threshold will be determined on start of acquisition as half of incident energy. \nThis might lead to increased start time.\n"},"eiger_bit_depth":{"type":"integer","format":"int64","enum":[8,16,32],"description":"Bit depth of PSI EIGER read-out. This is  \nIf value is not provided, depth will be determined based on the image time:\n* Exposure time < 500 microseconds depth of 8 bit will be used,\n* 500 <= exposure time < 2622 microseconds depth of 16 bit will be used\n* Exposure time >= 2622 microseconds depth of 32 bit will be used.\n"},"jungfrau_pedestal_g0_frames":{"type":"integer","format":"int64","default":2000,"minimum":0},"jungfrau_pedestal_g1_frames":{"type":"integer","format":"int64","default":300,"minimum":0},"jungfrau_pedestal_g2_frames":{"type":"integer","format":"int64","default":300,"minimum":0},"jungfrau_pedestal_min_image_count":{"type":"integer","format":"int64","default":128,"minimum":32,"description":"Minimum number of collected images for pedestal to consider it viable"},"jungfrau_storage_cell_count":{"type":"integer","format":"int64","default":1,"minimum":1,"maximum":16},"jungfrau_storage_cell_delay_ns":{"type":"integer","format":"int64","minimum":2100,"default":5000,"description":"Delay between two storage cells [ns]"},"jungfrau_fixed_gain_g1":{"type":"boolean","default":false,"description":"Fix gain to G1 (can be useful for storage cells)"},"jungfrau_use_gain_hg0":{"type":"boolean","default":false,"description":"Use high G0 (for low energy applications)"}}},"spot_finding_settings":{"type":"object","required":["enable","indexing","signal_to_noise_threshold","photon_count_threshold","max_pix_per_spot","min_pix_per_spot","quick_integration","high_resolution_limit_for_spot_count_low_res","ice_ring_width_q_recipA"],"properties":{"enable":{"type":"boolean","default":true,"description":"Enable spot finding. This is temporary setting, i.e. can be changed anytime during data collection. \nEven if disabled spot finding information will still be send and written, though always with zero spots.\n"},"indexing":{"type":"boolean","default":true,"description":"Enable indexing. This is temporary setting, i.e. can be changed anytime during data collection.\n"},"signal_to_noise_threshold":{"type":"number","format":"float","minimum":0},"photon_count_threshold":{"type":"integer","format":"int64","minimum":0},"min_pix_per_spot":{"type":"integer","format":"int64","minimum":1},"max_pix_per_spot":{"type":"integer","format":"int64","minimum":1},"high_resolution_limit":{"type":"number","format":"float","description":"High resolution limit for spot finding [Angstrom]. Optional: if omitted, spot finding extends\nas far as the detector reaches, i.e. the detection is not clipped in resolution.\n"},"low_resolution_limit":{"type":"number","format":"float","description":"Low resolution limit for spot finding [Angstrom]. Optional: if omitted, spot finding is not\nclipped at the low-resolution end. A value of 0 is accepted and means the same thing.\n"},"high_resolution_limit_for_spot_count_low_res":{"type":"number","format":"float","description":"High resolution threshold to consider spot \"low resolution\" [Angstrom]","minimum":2,"maximum":8},"quick_integration":{"type":"boolean","default":false,"description":"Quick integration of Bragg spots in diffraction images.\nIf enabled it will likely reduce performance of Jungfraujoch for datasets with a very high indexing rate.\n(experimental feature)\n"},"ice_ring_width_q_recipA":{"type":"number","format":"float","minimum":0,"maximum":1,"default":0.03,"description":"Half-width of the ice ring band in q (1/A). Matches the offline default in image_analysis/spot_finding/SpotFindingSettings.h, which was set from a measured ring FWHM of ~0.06; the two must agree or the same data gets a narrower ice band online."},"high_res_gap_Q_recipA":{"type":"number","format":"float","minimum":0.1,"maximum":5,"default":1.5,"description":"This parameter is used to remove spurious spots at a very high resolution, that sometimes appear due to very low background close to the edge of the detector.\nIf there is a gap in (1/d)-space between spots of at least this size, spots on the side of the gap with high resolution will be discarded. This is optional parameter.\nThis option should be turned OFF for small molecule datasets or for crystals with very low mosaicity, when it is expected to see only few spots in any case.\n"},"adaptive_threshold":{"type":"boolean","default":false,"description":"Self-calibrating spot detection: replace the fixed photon_count_threshold by a per-resolution-ring\nthreshold derived from each image's own noise, so the same setting works across datasets without\nper-dataset tuning. photon_count_threshold is then ignored and false_pixels_per_frame sets the\noperating point instead.\nOnly available on detectors whose images are analysed in software (the DECTRIS/SIMPLON workflow).\nThe JUNGFRAU and EIGER workflows find spots on the FPGA, which applies its own fixed threshold,\nso enabling this there is rejected rather than silently ignored.\n"},"false_pixels_per_frame":{"type":"number","format":"float","minimum":1,"maximum":100000,"default":100,"description":"Operating point of the adaptive threshold: the number of noise pixels tolerated per frame.\nAbout 100 suits a multi-megapixel detector. Ignored unless adaptive_threshold is set.\n"}}},"azim_int_settings":{"type":"object","required":["solid_angle_corr","polarization_corr","low_q_recipA","q_spacing"],"properties":{"polarization_corr":{"type":"boolean","description":"Apply polarization correction for azimuthal integration (polarization factor must be configured in dataset settings)","default":true},"solid_angle_corr":{"type":"boolean","description":"Apply solid angle correction for azimuthal integration","default":true},"high_q_recipA":{"type":"number","minimum":0.00002,"maximum":10,"format":"float","description":"Upper q limit of the azimuthal integration [1/Angstrom]. Optional: if omitted, the integration\n(and the adaptive spot detection that shares these q bins) extends to the highest q the\ndetector reaches.\n"},"low_q_recipA":{"type":"number","format":"float","minimum":0.00001,"maximum":10},"q_spacing":{"type":"number","format":"float","minimum":0.00001},"azimuthal_bins":{"type":"integer","format":"int64","minimum":1,"maximum":512,"default":1,"description":"Numer of azimuthal (phi) bins; 1 = standard 1D azimuthal integration"},"force_cpu":{"type":"boolean","default":false,"description":"Force CPU processing of azimuthal integration in the FPGA data acquisition workflow.\nThis allows to extend number of azimuthal integration bins, as well as to calculate standard deviation\nof the azimuthal integration results.\n"}}},"detector_list_element":{"type":"object","required":["id","nmodules","description","width","height","serial_number","base_ipv4_addr","udp_interface_count","readout_time_ns","min_frame_time_ns","min_count_time_ns"],"properties":{"id":{"type":"integer","format":"int64","minimum":0},"description":{"type":"string","example":"JUNGFRAU 4 Mpixel"},"serial_number":{"type":"string","example":"JF17T16V01"},"base_ipv4_addr":{"type":"string","example":"10.10.10.1"},"udp_interface_count":{"type":"integer","format":"int64","example":2,"description":"Number of UDP interfaces per detector module"},"nmodules":{"type":"integer","format":"int64","example":18},"width":{"type":"integer","format":"int64","example":2068},"height":{"type":"integer","format":"int64","example":2164},"pixel_size_mm":{"type":"number","format":"float","example":0.075},"readout_time_ns":{"type":"integer","format":"int64"},"min_frame_time_ns":{"type":"integer","format":"int64"},"min_count_time_ns":{"type":"integer","format":"int64"},"type":{"$ref":"#/components/schemas/detector_type"}}},"detector_list":{"type":"object","required":["detectors","current_id"],"properties":{"detectors":{"type":"array","items":{"$ref":"#/components/schemas/detector_list_element"}},"current_id":{"type":"integer","format":"int64","example":0}}},"detector_selection":{"type":"object","required":["id"],"properties":{"id":{"type":"integer","format":"int64","example":1}}},"measurement_statistics":{"type":"object","properties":{"file_prefix":{"type":"string"},"run_number":{"type":"integer","format":"int64","description":"Number of data collection run. This can be either automatically incremented or provided externally for each data collection.\n"},"experiment_group":{"type":"string","description":"Name of group owning the data (e.g. p-group or proposal number).\n"},"images_expected":{"type":"integer","format":"int64"},"images_collected":{"type":"integer","format":"int64","description":"Images collected by the receiver. This number will be lower than images expected if there were issues with data collection performance.\n"},"images_sent":{"type":"integer","format":"int64","description":"Images sent to the writer. \nThe value does not include images discarded by lossy compression filter and images not forwarded due to full ZeroMQ queue.\n"},"images_written":{"type":"integer","format":"int64","description":"Images successfully written to disk.\nThe value is live updated for TCP/IP socket and direct HDF5 writer, while for ZeroMQ it is only updated at the end of experiment.\n"},"images_discarded_lossy_compression":{"type":"integer","format":"int64","description":"Images discarded by the lossy compression filter"},"max_image_number_sent":{"type":"integer","format":"int64"},"collection_efficiency":{"type":"number","format":"float","example":1,"minimum":0,"maximum":1},"compression_ratio":{"type":"number","format":"float","example":5.3,"minimum":0},"cancelled":{"type":"boolean"},"max_receiver_delay":{"type":"integer","format":"int64"},"indexing_rate":{"type":"number","format":"float"},"detector_width":{"type":"integer","format":"int64"},"detector_height":{"type":"integer","format":"int64"},"detector_pixel_depth":{"type":"integer","format":"int64","enum":[2,4]},"bkg_estimate":{"type":"number","format":"float"},"unit_cell":{"type":"string"},"error_pixels":{"type":"number","format":"float","description":"Moving average of 1000 images counting number of error pixels on the detector"},"saturated_pixels":{"type":"number","format":"float","description":"Moving average of 1000 images counting number of saturated pixels on the detector"},"roi_beam_pixels":{"type":"number","format":"float","description":"If there is an ROI defined with name \"beam\", this number will hold moving average of 1000 images\nfor number of valid pixels within this ROI\n"},"roi_beam_sum":{"type":"number","format":"float","description":"If there is an ROI defined with name \"beam\", this number will hold moving average of 1000 images\nfor sum of valid pixels within this ROI\n"}}},"fpga_status":{"type":"array","items":{"type":"object","required":["pci_dev_id","serial_number","base_mac_addr","eth_link_status","eth_link_count","eth_link_speed","power_usage_W","fpga_temp_C","hbm_temp_C","packets_sls","packets_udp","idle","fw_version","pcie_link_speed","pcie_link_width"],"properties":{"pci_dev_id":{"type":"string"},"serial_number":{"type":"string"},"fw_version":{"type":"string"},"base_mac_addr":{"type":"string"},"eth_link_count":{"type":"integer","format":"int64"},"eth_link_status":{"type":"integer","format":"int64"},"power_usage_W":{"type":"number","format":"float"},"fpga_temp_C":{"type":"number","format":"float"},"hbm_temp_C":{"type":"number","format":"float"},"packets_udp":{"type":"integer","format":"int64"},"packets_sls":{"type":"integer","format":"int64"},"idle":{"type":"boolean"},"pcie_link_speed":{"type":"integer","format":"int64","description":"PCIe link speed measured by generation (expected value is 4 == PCIe Gen4)"},"pcie_link_width":{"type":"integer","format":"int64","description":"PCIe link width (expected value is 8 == x8)"}}}},"broker_status":{"type":"object","required":["state"],"properties":{"state":{"type":"string","enum":["Inactive","Idle","Busy","Measuring","Pedestal","Error"]},"progress":{"type":"number","format":"float","description":"Progress of data collection (only available if receiving is running)","example":1,"minimum":0,"maximum":1},"message":{"type":"string","description":"Message to display besides state of the jfjoch_broker; mostly used for errors and warnings\nThis matters especially for async functions (start/initialize), where API won't return reason\nfor the error during async operation.\n"},"message_severity":{"type":"string","enum":["success","info","warning","error"],"default":"error","description":"Level of the message to display"},"gpu_count":{"type":"integer","format":"int32","description":"Number of installed GPUs"},"broker_version":{"type":"string","description":"Version of the jfjoch_broker","example":"1.0.0-rc.128"}}},"image_pusher_status":{"type":"object","required":["pusher_type","addr","connected_writers"],"description":"Informs about status of the image pusher.\n","properties":{"pusher_type":{"$ref":"#/components/schemas/image_pusher_type"},"addr":{"type":"array","items":{"type":"string"},"example":["tcp://1.2.3.4:5000","tcp://1.2.3.4:5001"],"description":"List of addresses of image pushers.\nFor HDF5 socket - no addresses will be returned.\nFor ZeroMQ - list of addresses for each socket will be provided.\nFor TCP/IP - single address to connect all writers will be provided.\n"},"connected_writers":{"type":"integer","format":"int64","minimum":0,"description":"Number of connected writers \nFor ZeroMQ image socket: number is constant\nFor TCP/IP image socket: number is updated live during operation\n"},"images_written":{"type":"integer","format":"int64","minimum":0,"description":"Number of images written to the image socket.\nThis number is updated live during operation for TCP/IP image socket and direct HDF5 writer.\nIt is updated at the end of experiment for ZeroMQ image socket.\n"},"images_write_error":{"type":"integer","format":"int64","minimum":0,"description":"Number of images that could not be written to the image socket.\nThis number is updated live during operation for TCP/IP image socket.\nNo other socket use it.\n"},"writer_fifo_utilization":{"type":"array","items":{"type":"integer","format":"int64","minimum":0},"description":"Utilization of internal writer FIFO.\nThis number is updated live during operation for TCP/IP image socket.\nNo other socket use it.\n"}}},"plot":{"type":"object","required":["x","y","title"],"description":"x and y coordinates for plotting, it is OK to assume that both arrays have the same size; layout is optimized for Plotly","properties":{"title":{"type":"string","default":""},"x":{"type":"array","items":{"type":"number","format":"float"}},"y":{"type":"array","items":{"type":"number","format":"float","nullable":true}},"z":{"type":"array","items":{"type":"number","format":"float","nullable":true}}}},"plot_unit_x":{"type":"string","enum":["image_number","q_recipA","d_A","angle_deg","ADU","grid_um"],"default":"image_number"},"plots":{"type":"object","required":["plot","unit_x"],"properties":{"title":{"type":"string"},"unit_x":{"$ref":"#/components/schemas/plot_unit_x"},"size_x":{"type":"number","format":"float","description":"Max X range of the plot"},"size_y":{"type":"number","format":"float","description":"Max Y range of the plot"},"plot":{"type":"array","items":{"$ref":"#/components/schemas/plot"}}}},"scan_result":{"type":"object","description":"Results of a scan","required":["images"],"properties":{"file_prefix":{"type":"string"},"rotation_unit_cell":{"$ref":"#/components/schemas/unit_cell"},"rotation_crystal_lattice":{"$ref":"#/components/schemas/crystal_lattice"},"rotation_bravais":{"type":"string","description":"Bravais lattice type of the global rotation-indexing solution: crystal-system\nletter + centering, e.g. \"tP\", \"oC\", \"cF\", \"hR\", \"mP\". Empty if not determined.\n"},"images":{"type":"array","items":{"type":"object","required":["efficiency","number"],"properties":{"efficiency":{"type":"number","format":"float"},"number":{"type":"integer","format":"int64","description":"Detector image number for a given cell"},"nx":{"type":"integer","format":"int64","description":"Cell position in X for grid scan"},"ny":{"type":"integer","format":"int64","description":"Cell position in Y for grid scan"},"angle":{"type":"number","format":"float","description":"Rotation angle associated with the image"},"bkg":{"type":"number","format":"float","description":"Background estimate"},"spindle_blind":{"type":"number","format":"float","description":"Fraction (0-1) of a rotation sweep's blind double cone that this orientation makes unrecoverable, assuming the nearest plausible lattice row is a lone 2-fold (a worst-case bound, not an estimate). At 0.5 and above a recovery protocol (second sweep, reorientation) should engage. Absent means the frame could not be assessed, which automation must treat the same as above threshold - it is not a zero.\n"},"spots":{"type":"integer","format":"int64","description":"Spot count"},"spots_low_res":{"type":"integer","format":"int64","description":"Spot count in low resolution range"},"spots_indexed":{"type":"integer","format":"int64","description":"Spot count within indexing tolerance"},"spots_ice":{"type":"integer","format":"int64","description":"Spot count within common ice ring resolutions"},"ice":{"type":"number","format":"float","description":"Strongest hexagonal-ice ring intensity over the smooth radial background (1 = no ice)"},"index":{"type":"integer","format":"int64","description":"Indexing solution"},"latt_count":{"type":"integer","format":"int64","description":"Indexing lattice count"},"pr":{"type":"number","format":"float","description":"Profile radius, i.e. how far reflections are from the Ewald sphere"},"b":{"type":"number","format":"float","description":"B-Factor estimate"},"uc":{"$ref":"#/components/schemas/unit_cell"},"xfel_pulseid":{"type":"integer","format":"int64","description":"XFEL pulse ID"},"pixel_sum":{"type":"integer","format":"int64","description":"Total sum of all pixels"},"max":{"type":"integer","format":"int64","description":"Max viable pixel"},"sat":{"type":"integer","format":"int64","description":"Number of saturated pixels"},"err":{"type":"integer","format":"int64","description":"Number of error pixels"},"res":{"type":"number","format":"float","description":"Diffraction resolution estimate"}}}}}},"powder_calibration_fit_sigma":{"type":"object","description":"What the powder ring fit knows about its own answer, from the covariance of the converged\nproblem. Each sigma is in its parameter's own unit and is scaled by the residual scatter of\nthat fit, so it is the usual \"how far could this move before the fit got visibly worse\".\nThe two correlations are the ones that matter: a tilt and a beam-centre shift both displace a\nring's radius as cos(phi) and are told apart only by how that amplitude grows with the ring's\nradius, so as the rings run out the pair stops being separable and these approach 1.\nThe rotation sigmas and the correlations are absent when the tilt was not a free parameter.\n","properties":{"beam_x_pxl":{"type":"number","format":"float","description":"Standard error of the fitted PONI x [pixels]"},"beam_y_pxl":{"type":"number","format":"float","description":"Standard error of the fitted PONI y [pixels]"},"detector_distance_mm":{"type":"number","format":"float","description":"Standard error of the fitted detector distance [mm]"},"poni_rot1_rad":{"type":"number","format":"float","description":"Standard error of the fitted rot1 [rad]"},"poni_rot2_rad":{"type":"number","format":"float","description":"Standard error of the fitted rot2 [rad]"},"correlation_beam_x_rot1":{"type":"number","format":"float","description":"Correlation between the fitted PONI x and rot1, -1 to 1"},"correlation_beam_y_rot2":{"type":"number","format":"float","description":"Correlation between the fitted PONI y and rot2, -1 to 1"}}},"powder_calibration_spot_check":{"type":"object","description":"Where the circle through the found spots puts the beam, and how far that is from the geometry\nactually fitted. An independent cross-check: it reads nothing from the file's own geometry, so\nit holds where the summed azimuthal profile does not - a profile binned about a badly wrong\ncentre shows each ring smeared across its sectors, and a fit on it converges on the wrong\nanswer without saying so. Two methods sharing no assumption, so the disagreement is the\nstatement. Absent when no spots were available.\n","properties":{"beam_x_pxl":{"type":"number","format":"float","description":"Beam centre x the spots vote for [pixels]"},"beam_y_pxl":{"type":"number","format":"float","description":"Beam centre y the spots vote for [pixels]"},"detector_distance_mm":{"type":"number","format":"float","description":"Detector distance the spots imply [mm]"},"disagreement_pxl":{"type":"number","format":"float","description":"Distance between the spots' beam centre and the fitted one [pixels]"}}},"powder_calibration_quality":{"type":"object","description":"What a powder calibration knows about the geometry it produced. A calibration that has gone\nwrong - the wrong standard named, a header too far out for the rings to be found - looks\nexactly like one that has not until these are read.\n","properties":{"converged":{"type":"boolean","description":"Whether the geometry beside this is a measurement of the data at all. False means at least\none of its parameters was carried over from the input file rather than fitted - which looks\nexactly like a good fit in every other field here - and see not_converged_reason for which.\nrugnux --mode calibration writes no .poni file in that case, a PONI file having no field in\nwhich to say it, and exits non-zero.\n"},"not_converged_reason":{"type":"string","description":"What made converged false, in words. Absent when the calibration converged."},"calibrant":{"type":"string","description":"The powder standard the rings were fitted to, or the unit cell given in its place"},"method":{"type":"string","description":"How the rings were measured. rings fits the arcs of the run-summed (q x azimuth) azimuthal\nprofile; spots fits the pooled per-image spot lists.\n","enum":["rings","spots"]},"ring_points":{"type":"integer","format":"int64","description":"Ring measurements the fit used"},"rms_radial_pxl":{"type":"number","format":"float","description":"Scatter of those measurements about the fitted rings, as a radial distance [pixels]. The\nsingle number that separates a calibration that worked from one that did not.\n"},"beam_sigma_pxl":{"type":"number","format":"float","description":"Standard error the scatter implies on the beam centre [pixels], for a ring of that many\npoints. See powder_calibration_fit_sigma for what the fit itself says, which is not the same and\nis the larger of the two whenever the tilt is poorly separated.\n"},"direct_beam_x_pxl":{"type":"number","format":"float","description":"Where the direct beam lands [pixels]. NOT dataset_settings.beam_x_pxl, which is the PONI:\nthe two part company by distance*tan(tilt)/pixel as soon as the detector is tilted.\n"},"direct_beam_y_pxl":{"type":"number","format":"float","description":"Where the direct beam lands, y [pixels]"},"header_distance_mm":{"type":"number","format":"float","description":"The detector distance the input file declared, for comparison [mm]"},"ring_seed_distance_mm":{"type":"number","format":"float","description":"The distance measured from the ring radii before the fit ran [mm]. It is taken from the\nradii, the wavelength and the pixel size alone, so a large gap from header_distance_mm is\nthe answer to the question the calibration was run to ask. Absent when the profile showed\ntoo few rings to fix a scale.\n"},"tilt_refined":{"type":"boolean","description":"Whether the reported rot1/rot2 were measured by this fit. False means they were declined\nand pinned at the input file's values, because the rings could not separate a tilt from a\nshift of the beam centre.\n"},"tilt_significance":{"type":"number","format":"float","description":"How many of its own sigmas the fitted tilt stands from zero. Below about 3 it is not a\nmeasurement of a tilt but of a beam-centre shift, and the tilt is declined. Passing does\nnot certify a tilt: that estimator is limited by systematics rather than by this sigma.\n"},"fit_sigma":{"$ref":"#/components/schemas/powder_calibration_fit_sigma"},"spot_cross_check":{"$ref":"#/components/schemas/powder_calibration_spot_check"}}},"powder_calibration_output":{"type":"object","required":["dataset_settings"],"description":"The result of a powder-ring detector calibration - what rugnux --mode calibration writes as\n<prefix>.json, and what a calibration run over the image buffer would return.\n\ndataset_settings holds the geometry and nothing else, under the property names this API gives\nthem, so it can be POSTed or merged without translating a field. Its beam_x_pxl/beam_y_pxl is\nthe PONI, the foot of the perpendicular from the sample; where the beam actually lands is\ncalibration.direct_beam_x_pxl. The poni_rot*_rad are present whenever any of them is non-zero\nand absent when all are zero, since a body omitting them states a FLAT detector rather than an\nunstated one.\n","properties":{"dataset_settings":{"$ref":"#/components/schemas/dataset_settings"},"calibration":{"$ref":"#/components/schemas/powder_calibration_quality"},"jfjoch_version":{"type":"string","description":"Version of the program that produced this"}}},"calibration_statistics":{"type":"array","items":{"required":["module_number","storage_cell_number","pedestal_g0_mean","pedestal_g1_mean","pedestal_g2_mean","gain_g0_mean","gain_g1_mean","gain_g2_mean","masked_pixels"],"type":"object","properties":{"module_number":{"type":"integer","format":"int64"},"storage_cell_number":{"type":"integer","format":"int64"},"pedestal_g0_mean":{"type":"number","format":"float"},"pedestal_g1_mean":{"type":"number","format":"float"},"pedestal_g2_mean":{"type":"number","format":"float"},"gain_g0_mean":{"type":"number","format":"float"},"gain_g1_mean":{"type":"number","format":"float"},"gain_g2_mean":{"type":"number","format":"float"},"masked_pixels":{"type":"integer","format":"int64"}}}},"jfjoch_statistics":{"type":"object","description":"Pool statistics for Jungfraujoch to reduce transfers between frontend and jfjoch_broker","properties":{"detector":{"$ref":"#/components/schemas/detector_status"},"detector_list":{"$ref":"#/components/schemas/detector_list"},"detector_settings":{"$ref":"#/components/schemas/detector_settings"},"image_format_settings":{"$ref":"#/components/schemas/image_format_settings"},"instrument_metadata":{"$ref":"#/components/schemas/instrument_metadata"},"file_writer_settings":{"$ref":"#/components/schemas/file_writer_settings"},"data_processing_settings":{"$ref":"#/components/schemas/spot_finding_settings"},"measurement":{"$ref":"#/components/schemas/measurement_statistics"},"broker":{"$ref":"#/components/schemas/broker_status"},"fpga":{"$ref":"#/components/schemas/fpga_status"},"calibration":{"$ref":"#/components/schemas/calibration_statistics"},"zeromq_preview":{"$ref":"#/components/schemas/zeromq_preview_settings"},"zeromq_metadata":{"$ref":"#/components/schemas/zeromq_metadata_settings"},"dark_mask":{"$ref":"#/components/schemas/dark_mask_settings"},"pixel_mask":{"$ref":"#/components/schemas/pixel_mask_statistics"},"roi":{"$ref":"#/components/schemas/roi_definitions"},"az_int":{"$ref":"#/components/schemas/azim_int_settings"},"buffer":{"$ref":"#/components/schemas/image_buffer_status"},"indexing":{"$ref":"#/components/schemas/indexing_settings"},"bragg_integration":{"$ref":"#/components/schemas/bragg_integration_settings"},"image_pusher":{"$ref":"#/components/schemas/image_pusher_status"}}},"error_message":{"type":"object","required":["msg","reason"],"properties":{"msg":{"type":"string","description":"Human readable message","example":"Detector in wrong state"},"reason":{"type":"string","description":"Enumerate field for automated analysis","enum":["WrongDAQState","Other"]}}},"roi_azimuthal":{"type":"object","description":"ROI as Q-range (or resolution range), optionally restricted to an azimuthal-angle sector","required":["name","q_min_recipA","q_max_recipA"],"properties":{"name":{"type":"string","minLength":1,"description":"Name for the ROI; used in the plots"},"q_min_recipA":{"type":"number","format":"float","minimum":0.00001,"description":"Minimum Q-range for the ROI"},"q_max_recipA":{"type":"number","format":"float","minimum":0.00001,"description":"Maximum Q-range for the ROI"},"phi_min_deg":{"type":"number","format":"float","description":"Lower azimuthal-angle bound of the sector [degrees]. Optional: provide both phi_min_deg and phi_max_deg to restrict the ROI to an angular sector, or omit both for a full ring. A sector with phi_min_deg > phi_max_deg wraps across 0.\n"},"phi_max_deg":{"type":"number","format":"float","description":"Upper azimuthal-angle bound of the sector [degrees]. Optional; see phi_min_deg.\n"}}},"roi_circle":{"type":"object","description":"Circular ROI","required":["name","center_x_pxl","center_y_pxl","radius_pxl"],"properties":{"name":{"type":"string","minLength":1,"description":"Name for the ROI; used in the plots"},"center_x_pxl":{"type":"number","format":"float","description":"X coordinate of center of the circle [pixels]"},"center_y_pxl":{"type":"number","format":"float","description":"Y coordinate of center of the circle [pixels]"},"radius_pxl":{"type":"number","format":"float","minimum":0,"exclusiveMinimum":true,"description":"Radius of the circle [pixels]"}}},"roi_box":{"type":"object","description":"Box ROI","required":["name","min_x_pxl","max_x_pxl","min_y_pxl","max_y_pxl"],"properties":{"name":{"type":"string","minLength":1,"description":"Name for the ROI; used in the plots"},"min_x_pxl":{"type":"integer","format":"int64","description":"Lower bound (inclusive) in X coordinate for the box","minimum":0},"max_x_pxl":{"type":"integer","format":"int64","description":"Upper bound (inclusive) in X coordinate for the box","minimum":0},"min_y_pxl":{"type":"integer","format":"int64","description":"Lower bound (inclusive) in Y coordinate for the box","minimum":0},"max_y_pxl":{"type":"integer","format":"int64","description":"Upper bound (inclusive) in Y coordinate for the box","minimum":0}}},"roi_circle_list":{"type":"object","description":"List of circular ROIs","required":["rois"],"properties":{"rois":{"type":"array","maxItems":12,"items":{"$ref":"#/components/schemas/roi_circle"}}}},"roi_box_list":{"type":"object","description":"List of box ROIs","properties":{"rois":{"type":"array","maxItems":12,"items":{"$ref":"#/components/schemas/roi_box"}}}},"roi_azim_list":{"type":"object","description":"List of azimuthal ROIs","properties":{"rois":{"type":"array","maxItems":12,"items":{"$ref":"#/components/schemas/roi_azimuthal"}}}},"roi_definitions":{"type":"object","required":["box","circle","azim"],"description":"ROI defintions","properties":{"box":{"$ref":"#/components/schemas/roi_box_list"},"circle":{"$ref":"#/components/schemas/roi_circle_list"},"azim":{"$ref":"#/components/schemas/roi_azim_list"}}},"dark_mask_settings":{"type":"object","description":"Settings for collection of dark images to be used for mask calculation","required":["detector_threshold_keV","frame_threshold_keV","max_allowed_pixel_count","max_frames_with_signal","frame_time_us","number_of_frames"],"properties":{"detector_threshold_keV":{"type":"number","format":"float","description":"Energy threshold for dark image collection","minimum":2.5,"default":3.5,"maximum":100},"frame_time_us":{"type":"integer","format":"int64","description":"Time between frames for dark image collection","minimum":500,"default":10000,"maximum":100000},"number_of_frames":{"type":"integer","format":"int64","description":"Number of frames for dark image collection; zero means no dark collection","minimum":0,"default":1000},"max_allowed_pixel_count":{"type":"integer","format":"int64","description":"Maximum count in a pixel considered normal (not-masked)","minimum":0,"default":1},"max_frames_with_signal":{"type":"integer","format":"int64","description":"Maximum number of frames with signal in a pixel considered normal (not-masked)","minimum":0,"default":10}}},"indexing_settings":{"type":"object","description":"Settings for crystallography indexing","required":["algorithm","geom_refinement_algorithm","fft_high_resolution_A","fft_max_unit_cell_A","fft_min_unit_cell_A","fft_num_vectors","tolerance","thread_count","unit_cell_dist_tolerance","index_ice_rings","viable_cell_min_spots","rotation_indexing","rotation_indexing_min_angular_range_deg","rotation_indexing_angular_stride_deg","blocking"],"properties":{"algorithm":{"$ref":"#/components/schemas/indexing_algorithm"},"fft_max_unit_cell_A":{"type":"number","format":"float","default":250,"maximum":500,"minimum":50,"description":"Largest unit cell to be indexed by FFT algorithm; parameter value affects execution time of FFT"},"fft_min_unit_cell_A":{"type":"number","format":"float","default":10,"minimum":5,"maximum":40,"description":"Smallest unit cell to be indexed by FFT algorithm; parameter value affects execution time of FFT"},"fft_high_resolution_A":{"type":"number","format":"float","default":2,"minimum":0.5,"maximum":6,"description":"Sets how finely the FFT samples each search direction: it fixes the extent of the projection\nhistogram, and with it the transform size, so it affects execution time and memory of FFT.\nIt does NOT filter spots - every spot is projected whatever its resolution, so raising it\ndoes not make the transform see a coarser subset of the data.\nThere is also correlation between smallest unit cell and this value, which need to be checked for very small systems.\n"},"fft_num_vectors":{"type":"integer","format":"int64","minimum":128,"default":16384,"description":"Number of search directions for the FFT algorithm; parameter value affects execution time of FFT."},"tolerance":{"type":"number","format":"float","minimum":0,"maximum":0.5,"description":"Acceptance tolerance for spots after the indexing run - the larger the number, the more spots will be accepted"},"thread_count":{"type":"integer","format":"int64","minimum":1,"maximum":64,"description":"Thread count for indexing algorithm"},"geom_refinement_algorithm":{"$ref":"#/components/schemas/geom_refinement_algorithm"},"unit_cell_dist_tolerance":{"type":"number","format":"float","minimum":0.0001,"maximum":0.2001,"default":0.05,"description":"Relative distance tolerance for unit cell vs. reference; Lattices outside given tolerance will be ignored"},"viable_cell_min_spots":{"type":"integer","format":"int64","minimum":5,"default":10,"description":"Minimum number of indexed spots required for a cell to be considered viable"},"index_ice_rings":{"type":"boolean","default":false,"description":"Include spots marked as ice rings in the indexing run. \nIf `dataset_settings` doesn't have `detect_ice_rings` on, this option will have no effect on processing.\n"},"rotation_indexing":{"type":"boolean","default":false},"rotation_indexing_min_angular_range_deg":{"type":"number","format":"float","default":20,"minimum":1},"rotation_indexing_angular_stride_deg":{"type":"number","format":"float","default":0.5,"minimum":0},"blocking":{"type":"boolean","default":true,"description":"Indexing in Jungfraujoch goes with a dedicated thread pool.\nIf set to false, the thread pool is non-blocking, i.e. if there are no threads available, image indexing will be skipped. This option is recommended for real-time processing at high frame rates.\nIf set to true, the thread pool will block until a thread is available.\n"}}},"instrument_metadata":{"type":"object","description":"Metadata for a measurement instrument","required":["source_name","instrument_name"],"properties":{"source_name":{"type":"string","example":"Swiss Light Source"},"source_type":{"type":"string","description":"Type of radiation source. NXmx gives a fixed dictionary, though Jungfraujoch is not enforcing compliance. \nhttps://manual.nexusformat.org/classes/base_classes/NXsource.html#nxsource\nNXsource allows the following:\n\nSpallation Neutron Source\nPulsed Reactor Neutron Source\nReactor Neutron Source\nSynchrotron X-ray Source\nPulsed Muon Source\nRotating Anode X-ray\nFixed Tube X-ray\nUV Laser\nFree-Electron Laser\nOptical Laser\nIon Source\nUV Plasma Source\nMetal Jet X-ray\n","example":"Synchrotron X-ray Source","default":""},"instrument_name":{"type":"string","example":"CristallinaMX"},"pulsed_source":{"type":"boolean","description":"Settings specific to XFEL (e.g., every image has to come from TTL trigger, save pulse ID and event code)\n","default":false},"electron_source":{"type":"boolean","description":"Settings specific to electron source (e.g., wavelength definition)\n","default":false}}},"detector_module_direction":{"type":"string","enum":["Xp","Xn","Yp","Yn"]},"detector_type":{"type":"string","enum":["EIGER","JUNGFRAU","DECTRIS"]},"image_pusher_type":{"type":"string","default":"None","enum":["ZeroMQ","HDF5","CBOR","TCP","None"]},"standard_detector_geometry":{"type":"object","description":"Regular rectangular geometry, first module is in the bottom left corner of the detector","required":["nmodules"],"properties":{"nmodules":{"type":"integer","minimum":1,"description":"Number of modules in the detector"},"gap_x":{"type":"integer","default":8,"minimum":0,"description":"Gap size in X direction [pixels]"},"gap_y":{"type":"integer","minimum":0,"default":36,"description":"Gap size in Y direction [pixels]"},"modules_in_row":{"type":"integer","minimum":1,"default":1,"description":"Number of modules in one row"}}},"detector_module":{"type":"object","required":["x0","y0","fast_axis","slow_axis"],"properties":{"x0":{"type":"number"},"y0":{"type":"number"},"fast_axis":{"$ref":"#/components/schemas/detector_module_direction"},"slow_axis":{"$ref":"#/components/schemas/detector_module_direction"}}},"detector":{"type":"object","required":["description"],"properties":{"description":{"type":"string","minLength":1},"serial_number":{"type":"string","default":"Unknown","minLength":1},"type":{"$ref":"#/components/schemas/detector_type"},"high_voltage_V":{"type":"integer","format":"int64","minimum":0,"maximum":200,"default":0},"udp_interface_count":{"type":"integer","format":"int64","minimum":1,"maximum":2,"default":1},"module_sync":{"type":"boolean","default":true,"description":"Use module 0 as master for timing. Only applies to JUNGFRAU detector (this cannot be turned off for EIGER)."},"sensor_thickness_um":{"type":"number","format":"float","minimum":0,"default":320},"readout_time_ns":{"type":"integer","format":"int64","minimum":1,"description":"Minimum difference between frame time and count time in microseconds\nDefaults are 3'000 ns for EIGER and 20'000 ns for JUNGFRAU\n"},"min_count_time_ns":{"type":"integer","format":"int64","minimum":0,"description":"Minimum count time available for the detector."},"min_frame_time_ns":{"type":"integer","format":"int64","minimum":0,"description":"Minimum frame time available for the detector."},"calibration_file":{"type":"array","description":"Can be empty for all detectors - default calibration used.\nFor JUNGFRAU: list of gain files, one entry per module.\nFor EIGER: one directory (with detector settings) or list of trim bit files, one entry per half-module.\n","items":{"type":"string"}},"trim_energies_eV":{"type":"array","description":"List of energies at which trimming calibration is provided.\nOnly needed for PSI EIGER and compulsory in this case\n","items":{"type":"integer","format":"int32","minimum":100}},"hostname":{"type":"array","description":"Hostname for detector module. One entry per module\nOne entry per module. Either empty or number of module entries.\n","items":{"type":"string"}},"sensor_material":{"type":"string","default":"Si"},"tx_delay":{"type":"array","items":{"type":"integer","format":"int64"}},"base_data_ipv4_address":{"type":"string","example":"10.10.10.50"},"standard_geometry":{"$ref":"#/components/schemas/standard_detector_geometry"},"custom_geometry":{"type":"array","items":{"$ref":"#/components/schemas/detector_module"}},"roi_mode":{"type":"string","default":"","description":"ROI setting for DECTRIS detectors"},"mirror_y":{"type":"boolean","default":true,"description":"Mirror detector in Y direction to account for MX convention of (0,0) point in top left corner"},"temp_thresold_degC":{"type":"integer","format":"int64","description":"Temperature threshold for JUNGFRAU detector modules","minimum":40,"maximum":70,"default":55},"default_settings":{"$ref":"#/components/schemas/detector_settings"}}},"zeromq_settings":{"type":"object","description":"ZeroMQ configuration for Jungfraujoch software.\nThis structure is used to provide default settings using configuration JSON file and is not used in HTTP.\n","properties":{"send_watermark":{"type":"integer","format":"int64","minimum":2,"maximum":16384,"default":100,"description":"Watermark for ZeroMQ send queue (number of outstanding messages queued on Jungfraujoch server per queue)"},"send_buffer_size":{"type":"integer","format":"int64","description":"Send buffer size for ZeroMQ socket"},"image_socket":{"type":"array","items":{"type":"string"},"example":["tcp://1.2.3.4:5000","tcp://1.2.3.4:5001"],"description":"PUSH ZeroMQ socket for images. In case multiple sockets are provided, images are streamed over multiple sockets.  \nImages are serialized using CBOR.\nAddress follows ZeroMQ convention for sockets - in practice ipc://<socket file> and tpc://<IP address>:<port> sockets are OK.\n0.0.0.0 instead of IP address is accepted and means listening on all network interfaces.\n"},"writer_notification_socket":{"type":"string","example":"tcp://1.3.4.6:7000","description":"PULL ZeroMQ socket for notifications from writer that it finished operation. \nThis allows Jungfraujoch to operate in a synchronous manner, with end of acquisition being also end of writing.\nAddress follows ZeroMQ convention for sockets - in practice ipc://<socket file> and tpc://<IP address>:<port> sockets are OK.\n0.0.0.0 instead of IP address should be avoided, as this socket address is forwarded to the writer process via START ZerOMQ message and in case of multiple ineterfaces the address might be ambigous.\nUsing * (star) instead of port number is allowed and it means a random free port number.\n"}}},"tcp_settings":{"type":"object","description":"TCP image stream configuration for Jungfraujoch software.\nThis structure is used to provide default settings using configuration JSON file and is not used in HTTP.\n","required":["addr"],"properties":{"send_buffer_size":{"type":"integer","format":"int64","description":"Send buffer size for TCP/IP socket"},"image_socket":{"type":"string","example":"tcp://1.2.3.4:5000","description":"tcp://<IP address>:<port>\n0.0.0.0 instead of IP address is accepted and means listening on all network interfaces\n"},"nwriters":{"type":"integer","format":"int64","minimum":1,"maximum":100,"default":32,"description":"Number of TCP/IP writers to be used for streaming images"},"peer_liveness_timeout_ms":{"type":"integer","format":"int64","description":"Max time (in milliseconds) a send may block with no sign of life from the\nwriter (no BUSY heartbeat or ACK) before the connection is declared dead.\nOptional; the built-in default is used when unset.\n"},"max_backpressure_timeout_ms":{"type":"integer","format":"int64","description":"Hard upper bound (in milliseconds) on backpressure: if no bytes can be sent to\nthe writer for this long the connection is declared dead even while the writer\nkeeps heartbeating, so a wedged writer cannot block the run or its\nfinalization. Optional; the built-in default is used when unset.\n"}}},"pcie_devices":{"type":"array","minLength":1,"items":{"type":"object","required":["block_device"],"properties":{"blk":{"type":"string","example":"/dev/jfjoch0","description":"Block device name"},"ipv4":{"type":"string","example":"10.1.1.7","description":"IPv4 address of the block device"}}}},"bragg_integration_settings":{"type":"object","description":"Settings for Bragg spot integration","required":["integration_model"],"properties":{"integration_model":{"$ref":"#/components/schemas/integration_model"},"max_hkl":{"type":"integer","minimum":1,"maximum":511,"default":100,"description":"How far the Bragg predictor walks the lattice: reflections with |h|,|k|,|l| above this are\nnever predicted. An axis is truncated once a/d_min exceeds it, so a long axis - or a short\none taken to high resolution - loses its outermost reflections. The cost grows as the cube\n(2n+1)^3 of candidates per image, which is why online keeps a fixed, predictable value\ninstead of taking it from whichever crystal is mounted.\n\nOmitting the field selects the default above; it is never interpreted as \"choose per\ncrystal\". The offline tools (rugnux, viewer) do derive it from the refined cell when it is\nleft unset there, but that is their own default and is not reachable through this API.\n"}}},"jfjoch_settings":{"type":"object","required":["detector","frontend_directory","image_pusher"],"description":"Default settings for Jungfraujoch software. \nThis structure is used to provide default settings using configuration JSON file and is not used in HTTP.\n","properties":{"pcie":{"$ref":"#/components/schemas/pcie_devices"},"zeromq":{"$ref":"#/components/schemas/zeromq_settings"},"tcp":{"$ref":"#/components/schemas/tcp_settings"},"instrument":{"$ref":"#/components/schemas/instrument_metadata"},"file_writer":{"$ref":"#/components/schemas/file_writer_settings"},"detector":{"type":"array","minLength":1,"items":{"$ref":"#/components/schemas/detector"}},"indexing":{"$ref":"#/components/schemas/indexing_settings"},"bragg_integration":{"$ref":"#/components/schemas/bragg_integration_settings"},"detector_settings":{"$ref":"#/components/schemas/detector_settings"},"azim_int":{"$ref":"#/components/schemas/azim_int_settings"},"image_format":{"$ref":"#/components/schemas/image_format_settings"},"image_buffer_MiB":{"type":"integer","minimum":128,"default":2048,"description":"Size of internal buffer in MiB for images before they are sent to a stream"},"verbose":{"type":"boolean","default":false,"description":"Print extra debug information"},"receiver_threads":{"type":"integer","minimum":1,"maximum":512,"default":64,"description":"Number of threads used by the receiver"},"numa_policy":{"type":"string","deprecated":true,"description":"Ignored value"},"frontend_directory":{"type":"string","description":"Location of built JavaScript web frontend"},"spot_finding":{"$ref":"#/components/schemas/spot_finding_settings"},"image_pusher":{"$ref":"#/components/schemas/image_pusher_type"},"zeromq_preview":{"$ref":"#/components/schemas/zeromq_preview_settings"},"zeromq_metadata":{"$ref":"#/components/schemas/zeromq_metadata_settings"},"dark_mask":{"$ref":"#/components/schemas/dark_mask_settings"}}},"zeromq_metadata_settings":{"type":"object","required":["enabled","period_ms"],"properties":{"enabled":{"type":"boolean","default":true,"description":"ZeroMQ metadata socket is enabled."},"period_ms":{"type":"integer","format":"int64","minimum":1,"default":1000,"description":"Period for generating metadata package sent to the ZeroMQ interface in milliseconds.\n"},"socket_address":{"type":"string","description":"PUB ZeroMQ socket for image metadata information.\nImage metadata are serialized using CBOR.\nAddress follows ZeroMQ convention for sockets - in practice ipc://<socket file> and tcp://<IP address>:<port> sockets are OK.\n0.0.0.0 instead of IP address is accepted and means listening on all network interfaces.\n"}}},"zeromq_preview_settings":{"type":"object","required":["enabled","period_ms"],"properties":{"enabled":{"type":"boolean","default":true,"description":"ZeroMQ preview socket is enabled."},"period_ms":{"type":"integer","format":"int64","default":1000,"description":"Period for generating preview image sent to the ZeroMQ interface in milliseconds. Default is 1 second. \nIf set to zero, all images will be sent ZeroMQ (should be used only in case of relatively slow data collection).\nThis has no effect on HTTP based preview, which updates always at rate of 1 second.\n"},"socket_address":{"type":"string","description":"PUB ZeroMQ socket for preview images. This socket operates at a reduced frame rate.\nImages are serialized using CBOR.\nAddress follows ZeroMQ convention for sockets - in practice ipc://<socket file> and tcp://<IP address>:<port> sockets are OK.\n0.0.0.0 instead of IP address is accepted and means listening on all network interfaces.\n"}}}}},"paths":{"/initialize":{"post":{"summary":"Initialize detector and data acquisition","description":"Should be used in two cases:\n  - Detector is in `Inactive` state\n  - Detector is in `Error` state\nX-ray shutter must be closed. \nThis operation will reconfigure network interface of the detector. \nDuring operation of the detector it is recommended to use the `POST /pedestal` operation instead.\nIf storage cells are used, the execution time might be few minutes.\n\nThis is async function - one needs to use `POST /wait_till_done` to ensure operation is done.\n","responses":{"200":{"description":"Initialization started"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/pedestal":{"post":{"summary":"Collect dark current for the detector","description":"Updates calibration of the JUNGFRAU detector. Must be in `Idle` state.\n\nX-ray shutter must be closed. Recommended to run once per hour for long integration times (> 100 us).\n\nThis is async function - one needs to use `POST /wait_till_done` to ensure operation is done.\n","responses":{"200":{"description":"Everything OK"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/start":{"post":{"summary":"Start detector","description":"Start data acquisition.\nDetector must be in `Idle` state.\nDefault behavior is for the call to block until detector is ready to accept soft/TTL triggers.\nHowever, this behavior can be changed by settings `async_start` to true in the request body, \nin which case the call will return immediately and one needs to use `/wait_until_running` to ensure detector is ready to run.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/dataset_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/wait_until_running":{"post":{"summary":"Wait for acquisition running","parameters":[{"in":"query","name":"timeout","required":false,"schema":{"type":"integer","default":60,"minimum":0,"maximum":3600},"description":"Timeout in seconds (0 == immediate response)"}],"description":"Block execution of external script till detector and Jungfraujoch are ready to collect data.\nTo not block web server for a indefinite period of time, the procedure is provided with a timeout.\nExtending timeout is possible, but requires to ensure safety that client will not close the connection and retry the connection.\n","responses":{"200":{"description":"Detector in `Measuring` state"},"400":{"description":"Timeout parameter out of bounds"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}},"502":{"description":"Detector is inactive mode"},"504":{"description":"Timeout reached, need to restart operation"}}}},"/wait_till_done":{"post":{"summary":"Wait for acquisition done","parameters":[{"in":"query","name":"timeout","required":false,"schema":{"type":"integer","default":60,"minimum":0,"maximum":3600},"description":"Timeout in seconds (0 == immediate response)"}],"description":"Block execution of external script till initialization, data collection or pedestal is finished.\nRunning this command does not affect (cancel) running data collection, it is only to ensure synchronous execution of other software.\n\nTo not block web server for a indefinite period of time, the procedure is provided with a timeout.\nExtending timeout is possible, but requires to ensure safety that client will not close the connection and retry the connection.\n","responses":{"200":{"description":"Detector in `Idle` state, another data collection can start immediately.\nThe operation that finished either succeeded, was cancelled, or ended with a warning.\n"},"400":{"description":"Timeout parameter out of bounds"},"500":{"description":"Error within Jungfraujoch code, or the operation that finished ended in an error -\nmissing packets, or a writer that could not write - see output message.\nA cancelled data collection is not an error.\n","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}},"502":{"description":"Detector is inactive mode"},"504":{"description":"Timeout reached, need to restart operation"}}}},"/trigger":{"post":{"summary":"Send soft trigger to the detector","description":"Generate soft trigger","responses":{"200":{"description":"Trigger sent"}}}},"/cancel":{"post":{"summary":"Cancel running data collection","description":"Command will inform FPGA network card to stop pedestal or data collection at the current stage.\nAny frame that is currently being processed by CPU will be finished and sent to writer.\nGiven the command is making sure to gracefully stop data acquisition and detector, it might take some time to switch back after command finished to `Idle` state.\n\nIf data collection is not running, the command has no effect.\n","responses":{"200":{"description":"Cancel request sent to FPGAs (or ignored, as data collection is not running)"}}}},"/deactivate":{"post":{"summary":"Prepare detector to turn off","description":"Should be in `Idle` or `Error` state.\nCommand deactivates data acquisition and turns off detector high voltage and ASIC.\nShould be used always before turning off power from the detector.\n","responses":{"200":{"description":"Detector ready to turn off"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/config/detector":{"put":{"summary":"Change detector configuration","description":"Detector settings are ones that have effect on calibration, i.e., pedestal has to be collected again after changing these settings.\nThis can only be done when detector is `Idle`, `Error` or `Inactive` states.\nIf detector is in `Idle` state , pedestal procedure will be executed automatically - there must be no X-rays on the detector during the operation.\nIf detector is in `Inactive` or `Error` states, new settings will be saved, but no calibration will be executed.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/detector_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get detector configuration","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/detector_settings"}}}}}}},"/config/indexing":{"put":{"summary":"Change indexing algorithm settings","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/indexing_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get indexing configuration","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/indexing_settings"}}}}}}},"/config/bragg_integration":{"put":{"summary":"Change Bragg integration settings","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/bragg_integration_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get Bragg integration configuration","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/bragg_integration_settings"}}}}}}},"/config/file_writer":{"put":{"summary":"Change file writer settings","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/file_writer_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get file writer settings","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/file_writer_settings"}}}}}}},"/config/instrument":{"put":{"summary":"Change instrument metadata","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/instrument_metadata"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get instrument metadata","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/instrument_metadata"}}}}}}},"/config/image_format":{"put":{"summary":"Change image output format","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/image_format_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get image output format","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/image_format_settings"}}}}}}},"/config/image_format/raw":{"post":{"summary":"Configure format for raw data collection","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","responses":{"200":{"description":"Everything OK"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/config/image_format/conversion":{"post":{"summary":"Configure format for data collection with full conversion","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","responses":{"200":{"description":"Everything OK"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/config/spot_finding":{"put":{"summary":"Configure spot finding","description":"Can be done anytime, also while data collection is running","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/spot_finding_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}},"get":{"summary":"Get data processing configuration","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/spot_finding_settings"}}}}}}},"/config/azim_int":{"put":{"summary":"Configure azimuthal integration","description":"Can be done when detector is Inactive or Idle","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/azim_int_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get azimuthal integration configuration","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/azim_int_settings"}}}}}}},"/config/internal_generator_image":{"put":{"summary":"Load binary image for internal FPGA generator","description":"Load image for internal FPGA generator. This can only happen in Idle state of the detector.\nRequires binary blob with 16-bit integer numbers of size of detector in raw/converted coordinates \n(depending on detector settings).\n","parameters":[{"name":"id","in":"query","description":"Image id to upload","required":false,"schema":{"type":"integer","format":"int64","minimum":0,"maximum":127}}],"requestBody":{"content":{"application/octet-stream":{"schema":{"type":"string","format":"binary"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/config/internal_generator_image.tiff":{"put":{"summary":"Load TIFF image for internal FPGA generator","description":"Load image for internal FPGA generator. This can only happen in Idle state of the detector.\nRequires TIFF with 16-bit integer numbers of size of detector in raw/converted coordinates \n(depending on detector settings).\n","parameters":[{"in":"query","name":"id","description":"Image ID to upload","required":false,"schema":{"type":"integer","minimum":0,"maximum":127}}],"requestBody":{"content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/config/select_detector":{"put":{"summary":"Select detector","description":"Jungfraujoch allows to control multiple detectors and/or region-of-interests.\nThe command allows to choose one detector from the list (ID has to be consistent with one provided by GET response).\nChanging detector will set detector to `Inactive` state and will require reinitialization.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/detector_selection"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"List available detectors","description":"Configured detectors that can be selected by used","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/detector_list"}}}}}}},"/config/zeromq_preview":{"put":{"summary":"Set ZeroMQ preview settings","description":"Jungfraujoch can generate preview message stream on ZeroMQ SUB socket.\nHere settings of the socket can be adjusted.\nWhile the data structure contains also socket_address, this cannot be changed via HTTP and is ignore in PUT request.\nOptions set with this PUT request have no effect on HTTP based preview.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/zeromq_preview_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get ZeroMQ preview settings","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/zeromq_preview_settings"}}}}}}},"/config/zeromq_metadata":{"put":{"summary":"Set ZeroMQ metadata settings","description":"Jungfraujoch can generate metadata message stream on ZeroMQ PUB socket. This stream covers all images.\nHere settings of the socket can be adjusted.\nWhile the data structure contains also socket_address, this cannot be changed via HTTP and is ignore in PUT request.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/zeromq_metadata_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get ZeroMQ metadata socket settings","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/zeromq_metadata_settings"}}}}}}},"/config/dark_mask":{"put":{"summary":"Set configuration for dark data collection to calculate mask","description":"This is only possible when operating DECTRIS detectors at the moment; it will be also available for PSI EIGER at some point.\nThis can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/dark_mask_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get settings for dark data collection to calculate mask","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/dark_mask_settings"}}}}}}},"/status":{"get":{"summary":"Get Jungfraujoch status","description":"Status of the data acquisition","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/broker_status"}}}}}}},"/fpga_status":{"get":{"summary":"Get status of FPGA devices","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/fpga_status"}}}}}}},"/xfel/pulse_id":{"get":{"summary":"Return XFEL pulse IDs for the current data acquisition","description":"Return array of XFEL pulse IDs - (-1) if image not recorded","responses":{"200":{"description":"Pulse ID collected","content":{"application/json":{"schema":{"type":"array","items":{"type":"integer","format":"int64"}}}}},"404":{"description":"Not in XFEL mode or no acquisition recorded"}}}},"/xfel/event_code":{"get":{"summary":"Return XFEL event codes for the current data acquisition","description":"Return array of XFEL event codes","responses":{"200":{"description":"Event codes collected","content":{"application/json":{"schema":{"type":"array","items":{"type":"integer","format":"int64"}}}}},"404":{"description":"Not in XFEL mode or no acquisition recorded"}}}},"/image_pusher/status":{"get":{"summary":"Get status of image pusher","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/image_pusher_status"}}}},"500":{"description":"Error encountered when trying to read status","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/detector/status":{"get":{"summary":"Get detector status","description":"Status of the JUNGFRAU detector","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/detector_status"}}}},"404":{"description":"Running in \"simulator\" mode - no detector present"},"500":{"description":"Error encountered when trying to read status","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/config/roi":{"get":{"summary":"Get ROI definitions","responses":{"200":{"description":"OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/roi_definitions"}}}}}},"put":{"summary":"Upload ROI definitions","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/roi_definitions"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/statistics":{"get":{"summary":"Get general statistics","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/jfjoch_statistics"}}}}}}},"/statistics/data_collection":{"get":{"summary":"Get data collection statistics","description":"Results of the last data collection","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/measurement_statistics"}}}},"404":{"description":"No data collection performed so far"}}}},"/statistics/calibration":{"get":{"summary":"Get calibration statistics","description":"Statistics are provided for each module/storage cell separately","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/calibration_statistics"}}}}}}},"/config/mask":{"get":{"summary":"Get mask of the detector (binary)","description":"Detector must be Initialized.\nGet full pixel mask of the detector.\nSee NXmx standard for meaning of pixel values.\n","responses":{"200":{"description":"Binary array (4 byte; unsigned)","content":{"application/octet-stream":{"schema":{"type":"string","format":"binary"}}}}}}},"/config/user_mask":{"get":{"summary":"Detector must be Initialized.\nGet user mask of the detector (binary)\n","description":"Get user pixel mask of the detector in the actual detector coordinates: 0 - good pixel, 1 - masked","responses":{"200":{"description":"User mask in binary format (4 byte; unsigned)","content":{"application/octet-stream":{"schema":{"type":"string","format":"binary"}}}}}},"put":{"summary":"Upload user mask of the detector (binary)","description":"Should be in `Idle` state.\nUpload user mask of the detector - this is for example to account for beam stop shadow or misbehaving regions.\nIf detector is conversion mode the mask can be both in raw (1024x512; stacked modules) or converted coordinates.\nIn the latter case - module gaps are ignored and don't need to be assigned value.\nMask is expected as binary array (4-byte; unsigned).\n0 - good pixel, other value - masked\nUser mask is stored in NXmx pixel mask (bit 8), as well as used in spot finding and azimuthal integration.\n","requestBody":{"content":{"application/octet-stream":{"schema":{"type":"string","format":"binary"}}}},"responses":{"200":{"description":"All good"},"400":{"description":"Mask is not 4-byte unsigned integer array or empty body"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/config/mask.tiff":{"get":{"summary":"Get mask of the detector (TIFF)","description":"Should be in `Idle` state.\nGet full pixel mask of the detector\nSee NXmx standard for meaning of pixel values\n","responses":{"200":{"description":"Pixel mask in TIFF format (4 byte; unsigned)","content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}}}}},"/config/user_mask.tiff":{"get":{"summary":"Detector must be Initialized.\nGet user mask of the detector (TIFF)\n","description":"Get user pixel mask of the detector in the actual detector coordinates: 0 - good pixel, 1 - masked","responses":{"200":{"description":"User mask in TIFF format (4 byte; unsigned)","content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}}}},"put":{"summary":"Upload user mask of the detector","description":"Should be in `Idle` state.\nUpload user mask of the detector - this is for example to account for beam stop shadow or misbehaving regions.\nIf detector is conversion mode the mask can be both in raw (1024x512; stacked modules) or converted coordinates.\nIn the latter case - module gaps are ignored and don't need to be assigned value.\nMask is expected as a single-channel TIFF (8-, 16- or 32-bit integer, signed or unsigned).\n0 - good pixel, other value - masked\nUser mask is stored in NXmx pixel mask (bit 8), as well as used in spot finding and azimuthal integration.\nUser mask is not automatically applied - i.e. pixels with user mask will have a valid pixel value in the images.\n","requestBody":{"content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}},"responses":{"200":{"description":"All good"},"400":{"description":"Not a valid single-channel TIFF or size doesn't match the detector"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/preview/pedestal.tiff":{"get":{"parameters":[{"in":"query","name":"gain_level","required":true,"schema":{"type":"integer"},"description":"Gain level (0, 1, 2)"},{"in":"query","name":"sc","schema":{"type":"integer"},"description":"Storage cell number"}],"summary":"Get pedestal in TIFF format","responses":{"200":{"description":"Calibration image","content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}},"400":{"description":"Invalid gain level or storage cell number"},"404":{"description":"No calibration recorded so far"}}}},"/preview/plot":{"get":{"summary":"Generate 1D plot from Jungfraujoch","parameters":[{"$ref":"#/components/parameters/binning"},{"$ref":"#/components/parameters/plot_type"},{"$ref":"#/components/parameters/fill_value"},{"$ref":"#/components/parameters/experimental_coord"},{"$ref":"#/components/parameters/azint_unit"}],"responses":{"200":{"description":"Everything OK.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/plots"}}}},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/preview/plot.bin":{"get":{"summary":"Generate 1D plot from Jungfraujoch and send in raw binary format.\nData are provided as (32-bit) float binary array.\nThis format doesn't transmit information about X-axis, only values, so it is of limited use for azimuthal integration.\n","parameters":[{"$ref":"#/components/parameters/plot_type"},{"$ref":"#/components/parameters/roi"}],"responses":{"200":{"description":"Everything OK.","content":{"application/octet-stream":{"schema":{"type":"string","format":"binary"}}}},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/result/scan":{"get":{"summary":"Get full scan result","responses":{"200":{"description":"Everything OK.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/scan_result"}}}},"404":{"description":"No grid scan recorded"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/image_buffer/start.cbor":{"get":{"summary":"Get Start message in CBOR format","description":"Contains metadata for a dataset (e.g., experimental geometry)","responses":{"200":{"description":"Return start message","content":{"application/cbor":{"schema":{"type":"string","format":"binary"}}}},"404":{"description":"No measurement so far"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/image_buffer/image.cbor":{"get":{"summary":"Get image message in CBOR format","description":"Contains full image data and metadata. The image must come from the latest data collection.","parameters":[{"$ref":"#/components/parameters/image_id"}],"responses":{"200":{"description":"Return image message","content":{"application/cbor":{"schema":{"type":"string","format":"binary"}}}},"404":{"description":"Image not present in the buffer - either not yet measured or already replaced by a next image."},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/image_buffer/image.jpeg":{"get":{"summary":"Get preview image in JPEG format using custom settings","parameters":[{"$ref":"#/components/parameters/image_id"},{"$ref":"#/components/parameters/show_user_mask"},{"$ref":"#/components/parameters/show_roi"},{"$ref":"#/components/parameters/show_spots"},{"$ref":"#/components/parameters/show_predictions"},{"$ref":"#/components/parameters/show_beam_center"},{"$ref":"#/components/parameters/saturation"},{"$ref":"#/components/parameters/jpeg_quality"},{"$ref":"#/components/parameters/resolution_ring"},{"$ref":"#/components/parameters/color_scale"},{"$ref":"#/components/parameters/resolution_estimate"}],"responses":{"200":{"description":"Preview image","content":{"image/jpeg":{"schema":{"type":"string","format":"binary"}}}},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"404":{"description":"Image not present in the buffer - either not yet measured or already replaced by a next image."},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/image_buffer/image.tiff":{"get":{"summary":"Get preview image in TIFF format","parameters":[{"$ref":"#/components/parameters/image_id"}],"responses":{"200":{"description":"Preview image","content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}},"404":{"description":"No preview image recorded so far"}}}},"/image_buffer/clear":{"post":{"summary":"Clear image buffer","description":"Turns off image buffer for the last data collection. Can be only run when Jungfraujoch is not collecting data.","responses":{"200":{"description":"Done"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/image_buffer/status":{"get":{"summary":"Get status of the image buffers","description":"Can be run at any stage of Jungfraujoch operation, including during data collection.\nThe status of the image buffer is volatile during data collection - if data collection goes for more images than available buffer slots,\nthen image might be replaced in the buffer between calling /images and /image.cbor.\n","responses":{"200":{"description":"Done","content":{"application/json":{"schema":{"$ref":"#/components/schemas/image_buffer_status"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/version":{"get":{"summary":"Get Jungfraujoch version of jfjoch_broker","responses":{"200":{"description":"Release number of Jungfraujoch","content":{"text/plain":{"schema":{"type":"string","example":"1.0.0-rc.25"}}}}}}}}}},"searchIndex":{"store":["section/License-Clarification","/paths/~1initialize/post","/paths/~1pedestal/post","/paths/~1start/post","/paths/~1wait_until_running/post","/paths/~1wait_till_done/post","/paths/~1trigger/post","/paths/~1cancel/post","/paths/~1deactivate/post","/paths/~1config~1detector/put","/paths/~1config~1detector/get","/paths/~1config~1indexing/put","/paths/~1config~1indexing/get","/paths/~1config~1bragg_integration/put","/paths/~1config~1bragg_integration/get","/paths/~1config~1file_writer/put","/paths/~1config~1file_writer/get","/paths/~1config~1instrument/put","/paths/~1config~1instrument/get","/paths/~1config~1image_format/put","/paths/~1config~1image_format/get","/paths/~1config~1image_format~1raw/post","/paths/~1config~1image_format~1conversion/post","/paths/~1config~1spot_finding/put","/paths/~1config~1spot_finding/get","/paths/~1config~1azim_int/put","/paths/~1config~1azim_int/get","/paths/~1config~1internal_generator_image/put","/paths/~1config~1internal_generator_image.tiff/put","/paths/~1config~1select_detector/put","/paths/~1config~1select_detector/get","/paths/~1config~1zeromq_preview/put","/paths/~1config~1zeromq_preview/get","/paths/~1config~1zeromq_metadata/put","/paths/~1config~1zeromq_metadata/get","/paths/~1config~1dark_mask/put","/paths/~1config~1dark_mask/get","/paths/~1status/get","/paths/~1fpga_status/get","/paths/~1xfel~1pulse_id/get","/paths/~1xfel~1event_code/get","/paths/~1image_pusher~1status/get","/paths/~1detector~1status/get","/paths/~1config~1roi/get","/paths/~1config~1roi/put","/paths/~1statistics/get","/paths/~1statistics~1data_collection/get","/paths/~1statistics~1calibration/get","/paths/~1config~1mask/get","/paths/~1config~1user_mask/get","/paths/~1config~1user_mask/put","/paths/~1config~1mask.tiff/get","/paths/~1config~1user_mask.tiff/get","/paths/~1config~1user_mask.tiff/put","/paths/~1preview~1pedestal.tiff/get","/paths/~1preview~1plot/get","/paths/~1preview~1plot.bin/get","/paths/~1result~1scan/get","/paths/~1image_buffer~1start.cbor/get","/paths/~1image_buffer~1image.cbor/get","/paths/~1image_buffer~1image.jpeg/get","/paths/~1image_buffer~1image.tiff/get","/paths/~1image_buffer~1clear/post","/paths/~1image_buffer~1status/get","/paths/~1version/get"],"index":{"version":"2.3.9","fields":["title","description"],"fieldVectors":[["title/0",[0,4.111,1,4.753]],["description/0",[0,1.805,2,4.17,3,2.159,4,2.087,5,1.193,6,3.337,7,1.193,8,1.193,9,1.032,10,0.926,11,1.621,12,1.193,13,0.963,14,1.193,15,1.619,16,1.193,17,2.781,18,2.087,19,0.926,20,2.087,21,1.278,22,1.193,23,2.087,24,1.032,25,2.781,26,1.193,27,1.193,28,2.087,29,1.193,30,1.193,31,1.193,32,1.193,33,1.193,34,1.193,35,1.193,36,2.781,37,1.193,38,1.193,39,0.354,40,0.611,41,1.193,42,2.087,43,1.032,44,1.193,45,1.193,46,1.193,47,1.193,48,1.193,49,1.193,50,1.032,51,1.193,52,1.193,53,1.193,54,1.193,55,1.193,56,1.193,57,1.193,58,1.193,59,0.926,60,0.926,61,1.193]],["title/1",[62,2.314,63,0.416,64,0.989,65,1.935]],["description/1",[11,2.226,39,0.937,43,1.688,59,1.515,62,1.195,63,0.505,66,1.952,67,1.385,68,2.042,69,0.858,70,0.901,71,1.515,72,1.688,73,1.385,74,3.01,75,1.952,76,1.515,77,1.688,78,2.735,79,1.195,80,1.952,81,1.952,82,1.688,83,1.385,84,1.281,85,1.952,86,1.952,87,1.688,88,1.688,89,1.281,90,1.281,91,1.515,92,1.281,93,0.555]],["title/2",[63,0.416,94,1.384,95,2.932,96,2.681]],["description/2",[11,1.242,39,0.758,63,0.282,68,2.004,71,1.984,72,2.212,73,1.814,74,1.679,77,2.212,78,2.212,79,1.566,84,1.679,87,2.212,88,2.212,89,1.679,90,1.679,91,1.984,92,1.679,93,0.727,97,2.557,98,1.984,99,2.212,100,0.824,101,1.31,102,2.557,103,2.557,104,2.557,105,2.557,106,1.385,107,2.557]],["title/3",[63,0.524,108,3.688]],["description/3",[11,1.132,39,0.691,60,2.827,63,0.494,64,0.61,65,1.194,67,1.654,89,1.531,90,1.531,92,1.531,100,0.751,101,1.194,108,2.827,109,2.331,110,3.642,111,1.809,112,2.331,113,3.15,114,2.331,115,2.331,116,1.809,117,1.076,118,0.783,119,2.331,120,2.331,121,1.809,122,2.331,123,1.531,124,2.331,125,2.016]],["title/4",[65,2.156,101,2.156,126,3.641]],["description/4",[15,1.984,21,1.566,63,0.282,64,0.67,73,1.814,83,1.814,84,1.679,92,1.679,94,0.937,111,3.036,113,2.212,125,2.212,127,2.212,128,2.212,129,2.212,130,1.242,131,2.212,132,2.212,133,2.212,134,2.212,135,1.984,136,1.679,137,3.384,138,2.212,139,1.984,140,2.212,141,3.384,142,2.212]],["title/5",[65,2.156,93,1.197,126,3.641]],["description/5",[15,1.636,21,1.291,62,1.291,64,0.881,73,1.496,79,1.291,83,2.387,84,1.384,91,1.636,92,2.209,94,1.232,101,1.723,111,2.61,127,1.823,128,1.823,129,1.823,131,1.823,132,1.823,133,1.823,134,1.823,135,1.636,136,1.384,137,2.909,138,1.823,139,1.636,140,1.823,141,2.909,142,1.823,143,1.823,144,1.496,145,2.107,146,1.636,147,2.107,148,2.107]],["title/6",[63,0.416,116,2.932,149,3.268,150,3.268]],["description/6",[13,2.476,116,5.063,150,4.639]],["title/7",[64,0.989,94,1.384,101,1.935,146,2.932]],["description/7",[39,0.625,59,1.636,63,0.232,64,1.099,65,1.079,79,1.291,84,1.384,94,1.232,96,2.387,100,0.679,101,1.079,143,2.909,144,3.4,146,1.636,151,1.823,152,1.291,153,2.107,154,2.61,155,1.823,156,2.107,157,2.107,158,1.823,159,2.107,160,2.107,161,1.636,162,2.107,163,2.107,164,2.107,165,2.107,166,2.107,167,2.107,168,2.107,169,1.636]],["title/8",[63,0.464,170,4.21,171,3.267]],["description/8",[11,1.618,39,0.987,63,0.524,64,0.872,65,1.706,70,1.538,100,1.073,144,2.364,171,3.693,172,4.759,173,3.331,174,3.331,175,3.331,176,3.331,177,3.331,178,3.331]],["title/9",[63,0.464,117,1.944,179,1.851]],["description/9",[39,1.271,63,0.586,68,1.768,69,1.518,70,1.594,71,1.69,74,1.429,76,1.69,79,2.114,83,2.449,89,1.429,93,0.619,94,0.797,98,2.679,100,1.112,117,1.005,118,1.441,135,1.69,169,1.69,180,1.883,181,2.177,182,1.883,183,2.177,184,2.177,185,1.883]],["title/10",[63,0.524,179,2.09]],["description/10",[93,1.59,185,4.835,186,2.863]],["title/11",[117,1.745,118,1.27,187,3.268,188,3.778]],["description/11",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,189,4.135]],["title/12",[179,2.09,187,4.111]],["description/12",[93,1.59,186,2.863,189,4.835]],["title/13",[106,2.046,117,1.745,118,1.27,190,3.268]],["description/13",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,191,4.135]],["title/14",[106,2.28,179,1.851,190,3.641]],["description/14",[93,1.59,186,2.863,191,4.835]],["title/15",[10,2.932,117,1.745,118,1.27,161,2.932]],["description/15",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,192,4.135]],["title/16",[10,3.267,118,1.415,161,3.267]],["description/16",[93,1.59,186,2.863,192,4.835]],["title/17",[117,1.944,193,3.641,194,2.419]],["description/17",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,195,4.135]],["title/18",[193,4.111,194,2.731]],["description/18",[93,1.59,186,2.863,195,4.835]],["title/19",[117,1.745,196,1.27,197,3.268,198,1.835]],["description/19",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,199,4.135]],["title/20",[196,1.415,197,3.641,198,2.045]],["description/20",[93,1.59,186,2.863,199,4.835]],["title/21",[64,0.897,94,1.255,179,1.507,198,1.665,200,2.432]],["description/21",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,201,4.78]],["title/22",[64,0.821,94,1.149,179,1.379,198,1.523,202,2.059,203,2.433]],["description/22",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,204,4.78]],["title/23",[179,1.851,205,3.267,206,3.267]],["description/23",[64,1.299,93,1.41,94,1.817,101,2.54,186,2.54,207,4.29]],["title/24",[64,1.102,158,3.641,179,1.851]],["description/24",[93,1.59,186,2.863,207,4.835]],["title/25",[106,2.28,179,1.851,208,2.764]],["description/25",[63,0.568,69,2.266,93,1.465,100,1.66,209,4.458]],["title/26",[106,2.28,179,1.851,208,2.764]],["description/26",[93,1.59,186,2.863,209,4.835]],["title/27",[13,1.448,152,1.92,196,1.054,210,2.225,211,1.802,212,2.225]],["description/27",[13,1.397,21,1.853,39,0.897,63,0.579,100,0.975,118,1.017,152,1.853,196,1.017,210,2.147,211,1.739,212,2.147,213,2.617,214,3.026,215,2.617,216,2.348,217,2.617,218,2.617,219,2.617,220,1.853,221,2.617,222,3.026]],["title/28",[13,1.448,152,1.92,196,1.054,210,2.225,212,2.225,223,1.802]],["description/28",[13,1.43,21,1.897,39,0.918,63,0.587,100,0.998,118,1.041,152,1.897,196,1.041,210,2.198,212,2.198,213,2.679,215,2.679,216,2.403,217,2.679,218,2.679,219,2.679,220,1.897,221,2.679,223,1.78,224,3.097]],["title/29",[63,0.524,225,4.111]],["description/29",[21,1.698,24,2.397,39,0.821,50,3.597,63,0.611,69,1.219,89,2.731,117,1.28,118,0.932,130,1.346,136,1.82,144,1.967,226,2.771,227,2.771,228,2.771,229,2.771,230,2.397,231,2.151,232,2.771,233,2.771,234,2.771,235,2.397]],["title/30",[63,0.464,230,3.641,236,3.267]],["description/30",[11,2.503,63,0.568,179,2.266,225,4.458,235,4.458]],["title/31",[118,1.747,237,2.314,238,2.481]],["description/31",[13,1.181,64,0.67,117,1.181,118,1.315,121,3.036,130,1.242,169,1.984,237,1.566,238,2.569,239,1.814,240,2.212,241,2.557,242,3.036,243,2.212,244,2.212,245,2.212,246,1.814,247,2.212,248,2.212,249,3.384,250,1.814,251,3.384,252,2.557,253,2.557,254,2.212]],["title/32",[118,1.415,237,2.579,238,2.764]],["description/32",[254,5.283]],["title/33",[118,1.747,194,2.171,237,2.314]],["description/33",[13,1.307,64,0.741,117,1.307,118,0.951,121,2.197,130,1.375,194,1.627,196,0.951,237,1.734,239,2.009,240,3.655,242,3.279,243,2.449,244,2.449,245,2.449,246,2.009,247,2.449,248,2.449,249,2.449,250,2.009,251,2.449,255,2.831,256,2.831,257,2.449]],["title/34",[118,1.27,194,2.171,237,2.314,242,2.932]],["description/34",[257,5.283]],["title/35",[64,0.757,94,1.059,95,2.243,118,0.971,179,1.271,258,2.5,259,1.157]],["description/35",[39,1.068,63,0.554,69,1.585,70,1.664,74,2.367,93,1.025,100,1.161,139,2.797,236,2.797,260,3.604,261,3.604,262,3.604,263,3.604,264,3.604,265,3.118]],["title/36",[64,0.821,94,1.149,95,2.433,118,1.054,258,2.712,259,1.256]],["description/36",[265,5.283]],["title/37",[130,2.309,266,2.574]],["description/37",[64,1.404,65,2.747,266,3.533]],["title/38",[152,2.579,266,2.28,267,4.21]],["description/38",[268,6.108]],["title/39",[64,0.757,65,1.48,96,2.051,123,1.897,231,2.243,269,2.051,270,2.5]],["description/39",[68,2.208,123,2.831,196,1.449,231,3.346,269,3.06,270,3.729,271,3.06,272,3.346,273,4.311,274,4.311]],["title/40",[19,2.243,64,0.757,65,1.48,96,2.051,123,1.897,269,2.051,275,2.5]],["description/40",[19,3.849,123,3.257,269,3.52,271,3.52,275,4.29,276,4.959]],["title/41",[196,1.415,266,2.28,277,4.21]],["description/41",[278,6.108]],["title/42",[63,0.524,266,2.574]],["description/42",[63,0.591,99,4.639,266,2.905,279,5.363]],["title/43",[3,3.688,280,4.111]],["description/43",[281,5.283]],["title/44",[3,3.267,280,3.641,282,2.764]],["description/44",[281,5.283]],["title/45",[13,2.194,283,3.121]],["description/45",[283,4.011]],["title/46",[64,1.102,94,1.542,283,2.764]],["description/46",[64,1.349,94,1.888,284,4.458,285,4.458,286,5.153]],["title/47",[98,3.688,283,3.121]],["description/47",[82,4.135,136,3.139,283,3.139,287,4.78,288,4.78,289,4.78,290,4.78]],["title/48",[63,0.464,211,2.419,259,1.686]],["description/48",[62,2.405,63,0.588,202,2.578,259,1.572,291,3.268,292,3.396,293,2.786,294,3.396,295,3.396,296,2.578,297,3.926]],["title/49",[40,1.606,62,1.92,63,0.502,211,1.802,259,1.256]],["description/49",[40,1.898,63,0.565,68,2.627,220,2.27,259,2.054,272,2.876,291,3.141,298,3.205,299,2.63,300,2.63,301,3.205]],["title/50",[40,1.755,63,0.378,211,1.969,259,1.372,282,2.25]],["description/50",[11,0.767,39,0.468,40,1.359,63,0.292,67,1.12,68,2.061,90,1.036,100,0.508,106,0.855,154,1.225,200,1.12,203,1.225,205,1.225,206,1.225,208,1.036,211,0.907,220,0.967,250,1.12,259,1.947,271,1.12,282,1.036,291,1.625,293,1.12,296,1.742,299,1.12,300,1.12,301,1.365,302,1.365,303,1.365,304,1.365,305,1.365,306,1.365,307,1.365,308,1.365,309,1.365,310,1.365,311,1.365,312,2.295,313,1.365,314,1.365,315,1.365,316,1.365,317,1.365,318,1.365,319,1.578,320,1.365,321,1.365,322,1.365,323,1.365,324,1.365]],["title/51",[63,0.464,223,2.419,259,1.686]],["description/51",[39,1.164,63,0.433,100,1.265,202,2.578,259,1.572,291,3.268,292,3.396,293,2.786,294,3.396,295,3.396,296,2.578,325,3.926]],["title/52",[40,1.606,62,1.92,63,0.502,223,1.802,259,1.256]],["description/52",[40,1.898,63,0.565,68,2.627,220,2.27,259,2.054,272,2.876,291,3.141,298,3.205,299,2.63,300,2.63,326,3.205]],["title/53",[40,1.935,63,0.416,259,1.513,282,2.481]],["description/53",[9,1.134,11,0.637,39,0.389,40,1.825,63,0.25,67,0.931,68,2.06,90,0.861,100,0.423,106,0.71,154,1.018,180,1.134,182,1.134,196,0.441,200,0.931,203,1.018,205,1.018,206,1.018,208,0.861,216,1.018,220,0.803,223,0.754,250,0.931,259,1.998,282,0.861,291,2.182,293,0.931,296,1.964,299,0.931,300,0.931,302,1.134,303,1.134,304,1.134,305,1.134,306,1.134,307,1.134,308,1.134,309,1.134,310,1.134,311,1.134,312,1.96,313,1.134,314,1.134,315,1.134,316,1.134,317,1.134,318,1.134,320,1.134,321,1.134,322,1.134,323,1.96,324,1.134,326,1.134,327,1.311,328,1.311,329,1.134,330,1.311,331,1.311]],["title/54",[79,2.579,198,2.045,223,2.419]],["description/54",[332,6.108]],["title/55",[13,1.745,130,1.835,333,3.268,334,3.268]],["description/55",[335,6.108]],["title/56",[11,0.602,13,0.572,64,0.324,106,0.671,130,0.602,136,0.813,149,1.072,151,1.072,198,1.048,200,0.879,208,0.813,211,1.239,271,0.879,296,0.813,329,1.072,333,1.072,334,1.072,336,1.239,337,1.239,338,1.239,339,1.239,340,1.239]],["description/56",[341,6.108]],["title/57",[202,2.764,284,3.641,342,4.21]],["description/57",[343,6.108]],["title/58",[108,2.932,198,1.835,239,2.681,344,3.268]],["description/58",[194,2.747,246,3.392,345,4.78,346,4.78,347,4.78,348,4.78,349,4.78]],["title/59",[196,1.27,198,1.835,239,2.681,344,3.268]],["description/59",[64,1.456,94,1.529,194,2.399,196,1.869,202,2.741,246,2.963,350,4.175,351,4.175,352,4.175]],["title/60",[11,1.404,118,0.971,196,0.971,198,1.404,238,1.897,353,2.89,354,2.89]],["description/60",[355,6.108]],["title/61",[196,1.27,198,1.835,223,2.171,238,2.481]],["description/61",[356,6.108]],["title/62",[196,1.415,357,4.21,358,2.988]],["description/62",[64,1.456,94,2.037,101,2.138,130,2.028,171,3.24,196,1.403,285,3.611,358,2.963,359,4.175]],["title/63",[196,1.415,266,2.28,358,2.988]],["description/63",[60,1.946,64,1.23,68,1.285,74,1.647,76,2.992,94,1.72,101,1.285,130,1.218,155,2.169,196,1.771,236,1.946,266,1.358,358,3.332,360,2.508,361,2.508,362,2.508,363,2.508,364,2.508,365,2.508,366,2.508,367,2.508,368,2.508]],["title/64",[130,2.045,369,3.641,370,4.21]],["description/64",[369,5.283]]],"invertedIndex":[["",{"_index":68,"title":{},"description":{"1":{},"2":{},"9":{},"39":{},"49":{},"50":{},"52":{},"53":{},"63":{}}}],["0",{"_index":299,"title":{},"description":{"49":{},"50":{},"52":{},"53":{}}}],["1",{"_index":272,"title":{},"description":{"39":{},"49":{},"52":{}}}],["100",{"_index":107,"title":{},"description":{"2":{}}}],["1024x512",{"_index":310,"title":{},"description":{"50":{},"53":{}}}],["16",{"_index":328,"title":{},"description":{"53":{}}}],["16-bit",{"_index":215,"title":{},"description":{"27":{},"28":{}}}],["1d",{"_index":333,"title":{"55":{},"56":{}},"description":{}}],["32-bit",{"_index":329,"title":{"56":{}},"description":{"53":{}}}],["4-byte",{"_index":319,"title":{},"description":{"50":{}}}],["8",{"_index":323,"title":{},"description":{"50":{},"53":{}}}],["accept",{"_index":114,"title":{},"description":{"3":{}}}],["account",{"_index":303,"title":{},"description":{"50":{},"53":{}}}],["acquisit",{"_index":65,"title":{"1":{},"4":{},"5":{},"39":{},"40":{}},"description":{"3":{},"7":{},"8":{},"37":{}}}],["actual",{"_index":298,"title":{},"description":{"49":{},"52":{}}}],["adjust",{"_index":244,"title":{},"description":{"31":{},"33":{}}}],["affect",{"_index":145,"title":{},"description":{"5":{}}}],["again",{"_index":181,"title":{},"description":{"9":{}}}],["algorithm",{"_index":188,"title":{"11":{}},"description":{}}],["allow",{"_index":50,"title":{},"description":{"0":{},"29":{}}}],["alway",{"_index":176,"title":{},"description":{"8":{}}}],["and/or",{"_index":228,"title":{},"description":{"29":{}}}],["anytim",{"_index":186,"title":{},"description":{"10":{},"12":{},"14":{},"16":{},"18":{},"20":{},"23":{},"24":{},"26":{}}}],["api",{"_index":2,"title":{},"description":{"0":{}}}],["appli",{"_index":9,"title":{},"description":{"0":{},"53":{}}}],["applic",{"_index":17,"title":{},"description":{"0":{}}}],["approach",{"_index":30,"title":{},"description":{"0":{}}}],["array",{"_index":271,"title":{"56":{}},"description":{"39":{},"40":{},"50":{}}}],["asic",{"_index":175,"title":{},"description":{"8":{}}}],["assign",{"_index":317,"title":{},"description":{"50":{},"53":{}}}],["async",{"_index":87,"title":{},"description":{"1":{},"2":{}}}],["async_start",{"_index":119,"title":{},"description":{"3":{}}}],["automat",{"_index":182,"title":{},"description":{"9":{},"53":{}}}],["avail",{"_index":236,"title":{"30":{}},"description":{"35":{},"63":{}}}],["azimuth",{"_index":208,"title":{"25":{},"26":{},"56":{}},"description":{"50":{},"53":{}}}],["back",{"_index":168,"title":{},"description":{"7":{}}}],["base",{"_index":253,"title":{},"description":{"31":{}}}],["be",{"_index":157,"title":{},"description":{"7":{}}}],["beam",{"_index":304,"title":{},"description":{"50":{},"53":{}}}],["befor",{"_index":177,"title":{},"description":{"8":{}}}],["behavior",{"_index":110,"title":{},"description":{"3":{}}}],["between",{"_index":366,"title":{},"description":{"63":{}}}],["binari",{"_index":211,"title":{"27":{},"48":{},"49":{},"50":{},"56":{}},"description":{"27":{},"50":{}}}],["bit",{"_index":322,"title":{},"description":{"50":{},"53":{}}}],["blob",{"_index":214,"title":{},"description":{"27":{}}}],["block",{"_index":111,"title":{},"description":{"3":{},"4":{},"5":{}}}],["bodi",{"_index":122,"title":{},"description":{"3":{}}}],["both",{"_index":309,"title":{},"description":{"50":{},"53":{}}}],["bragg",{"_index":190,"title":{"13":{},"14":{}},"description":{}}],["buffer",{"_index":358,"title":{"62":{},"63":{}},"description":{"62":{},"63":{}}}],["calcul",{"_index":258,"title":{"35":{},"36":{}},"description":{}}],["calibr",{"_index":98,"title":{"47":{}},"description":{"2":{},"9":{}}}],["call",{"_index":60,"title":{},"description":{"0":{},"3":{},"63":{}}}],["cancel",{"_index":146,"title":{"7":{}},"description":{"5":{},"7":{}}}],["card",{"_index":153,"title":{},"description":{"7":{}}}],["case",{"_index":67,"title":{},"description":{"1":{},"3":{},"50":{},"53":{}}}],["cbor",{"_index":344,"title":{"58":{},"59":{}},"description":{}}],["cell",{"_index":82,"title":{},"description":{"1":{},"47":{}}}],["chang",{"_index":117,"title":{"9":{},"11":{},"13":{},"15":{},"17":{},"19":{}},"description":{"3":{},"9":{},"29":{},"31":{},"33":{}}}],["choos",{"_index":24,"title":{},"description":{"0":{},"29":{}}}],["clarif",{"_index":1,"title":{"0":{}},"description":{}}],["clear",{"_index":357,"title":{"62":{}},"description":{}}],["client",{"_index":15,"title":{},"description":{"0":{},"4":{},"5":{}}}],["close",{"_index":73,"title":{},"description":{"1":{},"2":{},"4":{},"5":{}}}],["code",{"_index":19,"title":{"40":{}},"description":{"0":{},"40":{}}}],["collect",{"_index":94,"title":{"2":{},"7":{},"21":{},"22":{},"35":{},"36":{},"46":{}},"description":{"4":{},"5":{},"7":{},"9":{},"23":{},"46":{},"59":{},"62":{},"63":{}}}],["come",{"_index":350,"title":{},"description":{"59":{}}}],["command",{"_index":144,"title":{},"description":{"5":{},"7":{},"8":{},"29":{}}}],["commun",{"_index":57,"title":{},"description":{"0":{}}}],["config/azim_int",{"_index":209,"title":{},"description":{"25":{},"26":{}}}],["config/bragg_integr",{"_index":191,"title":{},"description":{"13":{},"14":{}}}],["config/dark_mask",{"_index":265,"title":{},"description":{"35":{},"36":{}}}],["config/detector",{"_index":185,"title":{},"description":{"9":{},"10":{}}}],["config/file_writ",{"_index":192,"title":{},"description":{"15":{},"16":{}}}],["config/image_format",{"_index":199,"title":{},"description":{"19":{},"20":{}}}],["config/image_format/convers",{"_index":204,"title":{},"description":{"22":{}}}],["config/image_format/raw",{"_index":201,"title":{},"description":{"21":{}}}],["config/index",{"_index":189,"title":{},"description":{"11":{},"12":{}}}],["config/instru",{"_index":195,"title":{},"description":{"17":{},"18":{}}}],["config/internal_generator_imag",{"_index":222,"title":{},"description":{"27":{}}}],["config/internal_generator_image.tiff",{"_index":224,"title":{},"description":{"28":{}}}],["config/mask",{"_index":297,"title":{},"description":{"48":{}}}],["config/mask.tiff",{"_index":325,"title":{},"description":{"51":{}}}],["config/roi",{"_index":281,"title":{},"description":{"43":{},"44":{}}}],["config/select_detector",{"_index":235,"title":{},"description":{"29":{},"30":{}}}],["config/spot_find",{"_index":207,"title":{},"description":{"23":{},"24":{}}}],["config/user_mask",{"_index":301,"title":{},"description":{"49":{},"50":{}}}],["config/user_mask.tiff",{"_index":326,"title":{},"description":{"52":{},"53":{}}}],["config/zeromq_metadata",{"_index":257,"title":{},"description":{"33":{},"34":{}}}],["config/zeromq_preview",{"_index":254,"title":{},"description":{"31":{},"32":{}}}],["configur",{"_index":179,"title":{"9":{},"10":{},"12":{},"14":{},"21":{},"22":{},"23":{},"24":{},"25":{},"26":{},"35":{}},"description":{"30":{}}}],["connect",{"_index":141,"title":{},"description":{"4":{},"5":{}}}],["consist",{"_index":232,"title":{},"description":{"29":{}}}],["contain",{"_index":246,"title":{},"description":{"31":{},"33":{},"58":{},"59":{}}}],["control",{"_index":226,"title":{},"description":{"29":{}}}],["convers",{"_index":203,"title":{"22":{}},"description":{"50":{},"53":{}}}],["convert",{"_index":313,"title":{},"description":{"50":{},"53":{}}}],["coordin",{"_index":220,"title":{},"description":{"27":{},"28":{},"49":{},"50":{},"52":{},"53":{}}}],["copyleft",{"_index":7,"title":{},"description":{"0":{}}}],["cover",{"_index":256,"title":{},"description":{"33":{}}}],["cpu",{"_index":159,"title":{},"description":{"7":{}}}],["current",{"_index":96,"title":{"2":{},"39":{},"40":{}},"description":{"7":{}}}],["custom",{"_index":354,"title":{"60":{}},"description":{}}],["dark",{"_index":95,"title":{"2":{},"35":{},"36":{}},"description":{}}],["data",{"_index":64,"title":{"1":{},"7":{},"21":{},"22":{},"24":{},"35":{},"36":{},"39":{},"40":{},"46":{},"56":{}},"description":{"3":{},"4":{},"5":{},"7":{},"8":{},"23":{},"31":{},"33":{},"37":{},"46":{},"59":{},"62":{},"63":{}}}],["dataset",{"_index":345,"title":{},"description":{"58":{}}}],["deactiv",{"_index":172,"title":{},"description":{"8":{}}}],["dectri",{"_index":260,"title":{},"description":{"35":{}}}],["default",{"_index":109,"title":{},"description":{"3":{}}}],["definit",{"_index":3,"title":{"43":{},"44":{}},"description":{"0":{}}}],["depend",{"_index":221,"title":{},"description":{"27":{},"28":{}}}],["deriv",{"_index":47,"title":{},"description":{"0":{}}}],["detector",{"_index":63,"title":{"1":{},"2":{},"3":{},"6":{},"8":{},"9":{},"10":{},"29":{},"30":{},"42":{},"48":{},"49":{},"50":{},"51":{},"52":{},"53":{}},"description":{"1":{},"2":{},"3":{},"4":{},"7":{},"8":{},"9":{},"11":{},"13":{},"15":{},"17":{},"19":{},"21":{},"22":{},"25":{},"27":{},"28":{},"29":{},"30":{},"35":{},"42":{},"48":{},"49":{},"50":{},"51":{},"52":{},"53":{}}}],["detector/statu",{"_index":279,"title":{},"description":{"42":{}}}],["develop",{"_index":37,"title":{},"description":{"0":{}}}],["devic",{"_index":267,"title":{"38":{}},"description":{}}],["distribut",{"_index":22,"title":{},"description":{"0":{}}}],["doesn't",{"_index":337,"title":{"56":{}},"description":{}}],["don't",{"_index":316,"title":{},"description":{"50":{},"53":{}}}],["done",{"_index":93,"title":{"5":{}},"description":{"1":{},"2":{},"9":{},"10":{},"11":{},"12":{},"13":{},"14":{},"15":{},"16":{},"17":{},"18":{},"19":{},"20":{},"21":{},"22":{},"23":{},"24":{},"25":{},"26":{},"35":{}}}],["dure",{"_index":76,"title":{},"description":{"1":{},"9":{},"63":{}}}],["e.g",{"_index":346,"title":{},"description":{"58":{}}}],["each",{"_index":287,"title":{},"description":{"47":{}}}],["effect",{"_index":169,"title":{},"description":{"7":{},"9":{},"31":{}}}],["eiger",{"_index":263,"title":{},"description":{"35":{}}}],["ensur",{"_index":92,"title":{},"description":{"1":{},"2":{},"3":{},"4":{},"5":{}}}],["error",{"_index":70,"title":{},"description":{"1":{},"8":{},"9":{},"11":{},"13":{},"15":{},"17":{},"19":{},"21":{},"22":{},"35":{}}}],["etc",{"_index":46,"title":{},"description":{"0":{}}}],["event",{"_index":275,"title":{"40":{}},"description":{"40":{}}}],["exampl",{"_index":302,"title":{},"description":{"50":{},"53":{}}}],["except",{"_index":25,"title":{},"description":{"0":{}}}],["execut",{"_index":83,"title":{},"description":{"1":{},"4":{},"5":{},"9":{}}}],["expect",{"_index":318,"title":{},"description":{"50":{},"53":{}}}],["experiment",{"_index":347,"title":{},"description":{"58":{}}}],["explicitli",{"_index":38,"title":{},"description":{"0":{}}}],["extend",{"_index":138,"title":{},"description":{"4":{},"5":{}}}],["extern",{"_index":127,"title":{},"description":{"4":{},"5":{}}}],["few",{"_index":85,"title":{},"description":{"1":{}}}],["file",{"_index":10,"title":{"15":{},"16":{}},"description":{"0":{}}}],["find",{"_index":206,"title":{"23":{}},"description":{"50":{},"53":{}}}],["finish",{"_index":143,"title":{},"description":{"5":{},"7":{}}}],["float",{"_index":336,"title":{"56":{}},"description":{}}],["format",{"_index":198,"title":{"19":{},"20":{},"21":{},"22":{},"54":{},"56":{},"58":{},"59":{},"60":{},"61":{}},"description":{}}],["fpga",{"_index":152,"title":{"27":{},"28":{},"38":{}},"description":{"7":{},"27":{},"28":{}}}],["fpga_statu",{"_index":268,"title":{},"description":{"38":{}}}],["frame",{"_index":156,"title":{},"description":{"7":{}}}],["full",{"_index":202,"title":{"22":{},"57":{}},"description":{"48":{},"51":{},"59":{}}}],["function",{"_index":88,"title":{},"description":{"1":{},"2":{}}}],["gap",{"_index":315,"title":{},"description":{"50":{},"53":{}}}],["gcc",{"_index":33,"title":{},"description":{"0":{}}}],["gener",{"_index":13,"title":{"27":{},"28":{},"45":{},"55":{},"56":{}},"description":{"0":{},"6":{},"27":{},"28":{},"31":{},"33":{}}}],["geometri",{"_index":348,"title":{},"description":{"58":{}}}],["given",{"_index":162,"title":{},"description":{"7":{}}}],["goe",{"_index":362,"title":{},"description":{"63":{}}}],["good",{"_index":300,"title":{},"description":{"49":{},"50":{},"52":{},"53":{}}}],["gpl",{"_index":6,"title":{},"description":{"0":{}}}],["gpl-3.0",{"_index":5,"title":{},"description":{"0":{}}}],["gracefulli",{"_index":165,"title":{},"description":{"7":{}}}],["happen",{"_index":213,"title":{},"description":{"27":{},"28":{}}}],["header",{"_index":32,"title":{},"description":{"0":{}}}],["here",{"_index":243,"title":{},"description":{"31":{},"33":{}}}],["high",{"_index":173,"title":{},"description":{"8":{}}}],["hour",{"_index":104,"title":{},"description":{"2":{}}}],["http",{"_index":249,"title":{},"description":{"31":{},"33":{}}}],["i.",{"_index":180,"title":{},"description":{"9":{},"53":{}}}],["id",{"_index":231,"title":{"39":{}},"description":{"29":{},"39":{}}}],["idl",{"_index":100,"title":{},"description":{"2":{},"3":{},"7":{},"8":{},"9":{},"11":{},"13":{},"15":{},"17":{},"19":{},"21":{},"22":{},"25":{},"27":{},"28":{},"35":{},"50":{},"51":{},"53":{}}}],["ignor",{"_index":250,"title":{},"description":{"31":{},"33":{},"50":{},"53":{}}}],["imag",{"_index":196,"title":{"19":{},"20":{},"27":{},"28":{},"41":{},"59":{},"60":{},"61":{},"62":{},"63":{}},"description":{"27":{},"28":{},"33":{},"39":{},"53":{},"59":{},"62":{},"63":{}}}],["image.cbor",{"_index":367,"title":{},"description":{"63":{}}}],["image_buffer/clear",{"_index":359,"title":{},"description":{"62":{}}}],["image_buffer/image.cbor",{"_index":352,"title":{},"description":{"59":{}}}],["image_buffer/image.jpeg",{"_index":355,"title":{},"description":{"60":{}}}],["image_buffer/image.tiff",{"_index":356,"title":{},"description":{"61":{}}}],["image_buffer/start.cbor",{"_index":349,"title":{},"description":{"58":{}}}],["image_buffer/statu",{"_index":368,"title":{},"description":{"63":{}}}],["image_pusher/statu",{"_index":278,"title":{},"description":{"41":{}}}],["immedi",{"_index":124,"title":{},"description":{"3":{}}}],["implement",{"_index":16,"title":{},"description":{"0":{}}}],["impos",{"_index":54,"title":{},"description":{"0":{}}}],["inact",{"_index":69,"title":{},"description":{"1":{},"9":{},"11":{},"13":{},"15":{},"17":{},"19":{},"21":{},"22":{},"25":{},"29":{},"35":{}}}],["includ",{"_index":360,"title":{},"description":{"63":{}}}],["indefinit",{"_index":133,"title":{},"description":{"4":{},"5":{}}}],["index",{"_index":187,"title":{"11":{},"12":{}},"description":{}}],["inform",{"_index":151,"title":{"56":{}},"description":{"7":{}}}],["initi",{"_index":62,"title":{"1":{},"49":{},"52":{}},"description":{"1":{},"5":{},"48":{}}}],["instead",{"_index":80,"title":{},"description":{"1":{}}}],["instrument",{"_index":193,"title":{"17":{},"18":{}},"description":{}}],["integ",{"_index":216,"title":{},"description":{"27":{},"28":{},"53":{}}}],["integr",{"_index":106,"title":{"13":{},"14":{},"25":{},"26":{},"56":{}},"description":{"2":{},"50":{},"53":{}}}],["intend",{"_index":49,"title":{},"description":{"0":{}}}],["interact",{"_index":18,"title":{},"description":{"0":{}}}],["interfac",{"_index":43,"title":{},"description":{"0":{},"1":{}}}],["intern",{"_index":212,"title":{"27":{},"28":{}},"description":{"27":{},"28":{}}}],["ioctl",{"_index":45,"title":{},"description":{"0":{}}}],["jfjoch_brok",{"_index":370,"title":{"64":{}},"description":{}}],["jpeg",{"_index":353,"title":{"60":{}},"description":{}}],["jungfrau",{"_index":99,"title":{},"description":{"2":{},"42":{}}}],["jungfraujoch",{"_index":130,"title":{"37":{},"55":{},"56":{},"64":{}},"description":{"4":{},"29":{},"31":{},"33":{},"62":{},"63":{}}}],["kernel",{"_index":36,"title":{},"description":{"0":{}}}],["kernel'",{"_index":29,"title":{},"description":{"0":{}}}],["last",{"_index":285,"title":{},"description":{"46":{},"62":{}}}],["latest",{"_index":351,"title":{},"description":{"59":{}}}],["latter",{"_index":314,"title":{},"description":{"50":{},"53":{}}}],["librari",{"_index":35,"title":{},"description":{"0":{}}}],["licens",{"_index":0,"title":{"0":{}},"description":{"0":{}}}],["limit",{"_index":340,"title":{"56":{}},"description":{}}],["linux",{"_index":28,"title":{},"description":{"0":{}}}],["list",{"_index":230,"title":{"30":{}},"description":{"29":{}}}],["load",{"_index":210,"title":{"27":{},"28":{}},"description":{"27":{},"28":{}}}],["long",{"_index":105,"title":{},"description":{"2":{}}}],["make",{"_index":163,"title":{},"description":{"7":{}}}],["mask",{"_index":259,"title":{"35":{},"36":{},"48":{},"49":{},"50":{},"51":{},"52":{},"53":{}},"description":{"48":{},"49":{},"50":{},"51":{},"52":{},"53":{}}}],["mean",{"_index":295,"title":{},"description":{"48":{},"51":{}}}],["mechan",{"_index":61,"title":{},"description":{"0":{}}}],["mere",{"_index":42,"title":{},"description":{"0":{}}}],["messag",{"_index":239,"title":{"58":{},"59":{}},"description":{"31":{},"33":{}}}],["metadata",{"_index":194,"title":{"17":{},"18":{},"33":{},"34":{}},"description":{"33":{},"58":{},"59":{}}}],["minut",{"_index":86,"title":{},"description":{"1":{}}}],["misbehav",{"_index":306,"title":{},"description":{"50":{},"53":{}}}],["mode",{"_index":308,"title":{},"description":{"50":{},"53":{}}}],["modul",{"_index":312,"title":{},"description":{"50":{},"53":{}}}],["module/storag",{"_index":288,"title":{},"description":{"47":{}}}],["moment",{"_index":261,"title":{},"description":{"35":{}}}],["more",{"_index":363,"title":{},"description":{"63":{}}}],["multipl",{"_index":227,"title":{},"description":{"29":{}}}],["need",{"_index":90,"title":{},"description":{"1":{},"2":{},"3":{},"50":{},"53":{}}}],["network",{"_index":59,"title":{},"description":{"0":{},"1":{},"7":{}}}],["new",{"_index":183,"title":{},"description":{"9":{}}}],["number",{"_index":217,"title":{},"description":{"27":{},"28":{}}}],["nxmx",{"_index":293,"title":{},"description":{"48":{},"50":{},"51":{},"53":{}}}],["on",{"_index":89,"title":{},"description":{"1":{},"2":{},"3":{},"9":{},"29":{}}}],["onc",{"_index":102,"title":{},"description":{"2":{}}}],["openapi",{"_index":14,"title":{},"description":{"0":{}}}],["oper",{"_index":74,"title":{},"description":{"1":{},"2":{},"9":{},"35":{},"63":{}}}],["option",{"_index":252,"title":{},"description":{"31":{}}}],["output",{"_index":197,"title":{"19":{},"20":{}},"description":{}}],["pedest",{"_index":79,"title":{"54":{}},"description":{"1":{},"2":{},"5":{},"7":{},"9":{}}}],["per",{"_index":103,"title":{},"description":{"2":{}}}],["period",{"_index":134,"title":{},"description":{"4":{},"5":{}}}],["pixel",{"_index":291,"title":{},"description":{"48":{},"49":{},"50":{},"51":{},"52":{},"53":{}}}],["plot",{"_index":334,"title":{"55":{},"56":{}},"description":{}}],["point",{"_index":264,"title":{},"description":{"35":{}}}],["possibl",{"_index":139,"title":{},"description":{"4":{},"5":{},"35":{}}}],["post",{"_index":78,"title":{},"description":{"1":{},"2":{}}}],["power",{"_index":178,"title":{},"description":{"8":{}}}],["prepar",{"_index":170,"title":{"8":{}},"description":{}}],["preview",{"_index":238,"title":{"31":{},"32":{},"60":{},"61":{}},"description":{"31":{}}}],["preview/pedestal.tiff",{"_index":332,"title":{},"description":{"54":{}}}],["preview/plot",{"_index":335,"title":{},"description":{"55":{}}}],["preview/plot.bin",{"_index":341,"title":{},"description":{"56":{}}}],["procedur",{"_index":135,"title":{},"description":{"4":{},"5":{},"9":{}}}],["process",{"_index":158,"title":{"24":{}},"description":{"7":{}}}],["program",{"_index":41,"title":{},"description":{"0":{}}}],["provid",{"_index":136,"title":{"56":{}},"description":{"4":{},"5":{},"29":{},"47":{}}}],["provis",{"_index":8,"title":{},"description":{"0":{}}}],["psi",{"_index":262,"title":{},"description":{"35":{}}}],["pub",{"_index":255,"title":{},"description":{"33":{}}}],["puls",{"_index":270,"title":{"39":{}},"description":{"39":{}}}],["pusher",{"_index":277,"title":{"41":{}},"description":{}}],["put",{"_index":251,"title":{},"description":{"31":{},"33":{}}}],["raw",{"_index":200,"title":{"21":{},"56":{}},"description":{"50":{},"53":{}}}],["raw/convert",{"_index":219,"title":{},"description":{"27":{},"28":{}}}],["readi",{"_index":113,"title":{},"description":{"3":{},"4":{}}}],["recommend",{"_index":77,"title":{},"description":{"1":{},"2":{}}}],["reconfigur",{"_index":75,"title":{},"description":{"1":{}}}],["record",{"_index":273,"title":{},"description":{"39":{}}}],["regardless",{"_index":55,"title":{},"description":{"0":{}}}],["region",{"_index":307,"title":{},"description":{"50":{},"53":{}}}],["region-of-interest",{"_index":229,"title":{},"description":{"29":{}}}],["reiniti",{"_index":234,"title":{},"description":{"29":{}}}],["replac",{"_index":365,"title":{},"description":{"63":{}}}],["request",{"_index":121,"title":{},"description":{"3":{},"31":{},"33":{}}}],["requir",{"_index":21,"title":{},"description":{"0":{},"4":{},"5":{},"27":{},"28":{},"29":{}}}],["respons",{"_index":233,"title":{},"description":{"29":{}}}],["result",{"_index":284,"title":{"57":{}},"description":{"46":{}}}],["result/scan",{"_index":343,"title":{},"description":{"57":{}}}],["retri",{"_index":142,"title":{},"description":{"4":{},"5":{}}}],["return",{"_index":123,"title":{"39":{},"40":{}},"description":{"3":{},"39":{},"40":{}}}],["roi",{"_index":280,"title":{"43":{},"44":{}},"description":{}}],["run",{"_index":101,"title":{"4":{},"7":{}},"description":{"2":{},"3":{},"5":{},"7":{},"23":{},"62":{},"63":{}}}],["runtim",{"_index":34,"title":{},"description":{"0":{}}}],["safeti",{"_index":140,"title":{},"description":{"4":{},"5":{}}}],["save",{"_index":184,"title":{},"description":{"9":{}}}],["scan",{"_index":342,"title":{"57":{}},"description":{}}],["script",{"_index":128,"title":{},"description":{"4":{},"5":{}}}],["see",{"_index":292,"title":{},"description":{"48":{},"51":{}}}],["select",{"_index":225,"title":{"29":{}},"description":{"30":{}}}],["send",{"_index":149,"title":{"6":{},"56":{}},"description":{}}],["sent",{"_index":160,"title":{},"description":{"7":{}}}],["separ",{"_index":289,"title":{},"description":{"47":{}}}],["server",{"_index":132,"title":{},"description":{"4":{},"5":{}}}],["set",{"_index":118,"title":{"11":{},"13":{},"15":{},"16":{},"31":{},"32":{},"33":{},"34":{},"35":{},"36":{},"60":{}},"description":{"3":{},"9":{},"27":{},"28":{},"29":{},"31":{},"33":{}}}],["shadow",{"_index":305,"title":{},"description":{"50":{},"53":{}}}],["shutter",{"_index":72,"title":{},"description":{"1":{},"2":{}}}],["sign",{"_index":330,"title":{},"description":{"53":{}}}],["similar",{"_index":26,"title":{},"description":{"0":{}}}],["single-channel",{"_index":327,"title":{},"description":{"53":{}}}],["size",{"_index":218,"title":{},"description":{"27":{},"28":{}}}],["slot",{"_index":364,"title":{},"description":{"63":{}}}],["socket",{"_index":242,"title":{"34":{}},"description":{"31":{},"33":{}}}],["socket_address",{"_index":247,"title":{},"description":{"31":{},"33":{}}}],["soft",{"_index":150,"title":{"6":{}},"description":{"6":{}}}],["soft/ttl",{"_index":115,"title":{},"description":{"3":{}}}],["softwar",{"_index":148,"title":{},"description":{"5":{}}}],["sole",{"_index":12,"title":{},"description":{"0":{}}}],["specif",{"_index":52,"title":{},"description":{"0":{}}}],["spirit",{"_index":27,"title":{},"description":{"0":{}}}],["spot",{"_index":205,"title":{"23":{}},"description":{"50":{},"53":{}}}],["stack",{"_index":311,"title":{},"description":{"50":{},"53":{}}}],["stage",{"_index":155,"title":{},"description":{"7":{},"63":{}}}],["standard",{"_index":294,"title":{},"description":{"48":{},"51":{}}}],["start",{"_index":108,"title":{"3":{},"58":{}},"description":{"3":{}}}],["state",{"_index":39,"title":{},"description":{"0":{},"1":{},"2":{},"3":{},"7":{},"8":{},"9":{},"11":{},"13":{},"15":{},"17":{},"19":{},"21":{},"22":{},"27":{},"28":{},"29":{},"35":{},"50":{},"51":{},"53":{}}}],["statist",{"_index":283,"title":{"45":{},"46":{},"47":{}},"description":{"45":{},"47":{}}}],["statistics/calibr",{"_index":290,"title":{},"description":{"47":{}}}],["statistics/data_collect",{"_index":286,"title":{},"description":{"46":{}}}],["statu",{"_index":266,"title":{"37":{},"38":{},"41":{},"42":{},"63":{}},"description":{"37":{},"42":{},"63":{}}}],["stop",{"_index":154,"title":{},"description":{"7":{},"50":{},"53":{}}}],["storag",{"_index":81,"title":{},"description":{"1":{}}}],["store",{"_index":321,"title":{},"description":{"50":{},"53":{}}}],["stream",{"_index":240,"title":{},"description":{"31":{},"33":{}}}],["structur",{"_index":245,"title":{},"description":{"31":{},"33":{}}}],["sub",{"_index":241,"title":{},"description":{"31":{}}}],["subject",{"_index":20,"title":{},"description":{"0":{}}}],["sure",{"_index":164,"title":{},"description":{"7":{}}}],["switch",{"_index":167,"title":{},"description":{"7":{}}}],["synchron",{"_index":147,"title":{},"description":{"5":{}}}],["syscal",{"_index":44,"title":{},"description":{"0":{}}}],["take",{"_index":166,"title":{},"description":{"7":{}}}],["term",{"_index":23,"title":{},"description":{"0":{}}}],["through",{"_index":58,"title":{},"description":{"0":{}}}],["tiff",{"_index":223,"title":{"28":{},"51":{},"52":{},"54":{},"61":{}},"description":{"28":{},"53":{}}}],["till",{"_index":129,"title":{},"description":{"4":{},"5":{}}}],["time",{"_index":84,"title":{},"description":{"1":{},"2":{},"4":{},"5":{},"7":{}}}],["timeout",{"_index":137,"title":{},"description":{"4":{},"5":{}}}],["transmit",{"_index":338,"title":{"56":{}},"description":{}}],["trigger",{"_index":116,"title":{"6":{}},"description":{"3":{},"6":{}}}],["true",{"_index":120,"title":{},"description":{"3":{}}}],["turn",{"_index":171,"title":{"8":{}},"description":{"8":{},"62":{}}}],["two",{"_index":66,"title":{},"description":{"1":{}}}],["under",{"_index":4,"title":{},"description":{"0":{}}}],["unsign",{"_index":320,"title":{},"description":{"50":{},"53":{}}}],["until",{"_index":112,"title":{},"description":{"3":{}}}],["updat",{"_index":97,"title":{},"description":{"2":{}}}],["upload",{"_index":282,"title":{"44":{},"50":{},"53":{}},"description":{"50":{},"53":{}}}],["us",{"_index":11,"title":{"56":{},"60":{}},"description":{"0":{},"1":{},"2":{},"3":{},"8":{},"30":{},"50":{},"53":{}}}],["user",{"_index":40,"title":{"49":{},"50":{},"52":{},"53":{}},"description":{"0":{},"49":{},"50":{},"52":{},"53":{}}}],["userspac",{"_index":31,"title":{},"description":{"0":{}}}],["valid",{"_index":331,"title":{},"description":{"53":{}}}],["valu",{"_index":296,"title":{"56":{}},"description":{"48":{},"50":{},"51":{},"53":{}}}],["version",{"_index":369,"title":{"64":{}},"description":{"64":{}}}],["via",{"_index":248,"title":{},"description":{"31":{},"33":{}}}],["volatil",{"_index":361,"title":{},"description":{"63":{}}}],["voltag",{"_index":174,"title":{},"description":{"8":{}}}],["wait",{"_index":126,"title":{"4":{},"5":{}},"description":{}}],["wait_till_don",{"_index":91,"title":{},"description":{"1":{},"2":{},"5":{}}}],["wait_until_run",{"_index":125,"title":{},"description":{"3":{},"4":{}}}],["web",{"_index":131,"title":{},"description":{"4":{},"5":{}}}],["well",{"_index":324,"title":{},"description":{"50":{},"53":{}}}],["whether",{"_index":56,"title":{},"description":{"0":{}}}],["wider",{"_index":51,"title":{},"description":{"0":{}}}],["without",{"_index":53,"title":{},"description":{"0":{}}}],["work",{"_index":48,"title":{},"description":{"0":{}}}],["writer",{"_index":161,"title":{"15":{},"16":{}},"description":{"7":{}}}],["x-axi",{"_index":339,"title":{"56":{}},"description":{}}],["x-ray",{"_index":71,"title":{},"description":{"1":{},"2":{},"9":{}}}],["xfel",{"_index":269,"title":{"39":{},"40":{}},"description":{"39":{},"40":{}}}],["xfel/event_cod",{"_index":276,"title":{},"description":{"40":{}}}],["xfel/pulse_id",{"_index":274,"title":{},"description":{"39":{}}}],["zeromq",{"_index":237,"title":{"31":{},"32":{},"33":{},"34":{}},"description":{"31":{},"33":{}}}]],"pipeline":[]}},"options":{}};
+      const __redoc_state = {"menu":{"activeItemIdx":-1},"spec":{"data":{"openapi":"3.0.3","info":{"title":"Jungfraujoch","description":"API to control Jungfraujoch developed by the Paul Scherrer Institute (Switzerland).\nJungfraujoch is a data acquisition and analysis system for pixel array detectors, primarly PSI JUNGFRAU.\nJungfraujoch uses FPGA boards to acquire data at high data rates.\n\n# License Clarification\n\nWhile this API definition is licensed under GPL-3.0, **the GPL copyleft provisions do not apply**\nwhen this file is used solely to generate OpenAPI clients or when implementing applications that\ninteract with the API. Generated client code and applications using this API definition are not\nsubject to the GPL license requirements and may be distributed under terms of your choosing.\n\nThis exception is similar in spirit to the Linux Kernel's approach to userspace API headers and\nthe GCC Runtime Library Exception. The Linux Kernel developers have explicitly stated that\nuser programs that merely use the kernel interfaces (syscalls, ioctl definitions, etc.) are not\nderivative works of the kernel and are not subject to the terms of the GPL.\n\nThis exception is intended to allow wider use of this API specification without imposing GPL\nrequirements on applications that merely interact with the API, regardless of whether they\ncommunicate through network calls or other mechanisms.\n","version":"1.0.0-rc.169","contact":{"name":"Filip Leonarski (Paul Scherrer Institute)","email":"filip.leonarski@psi.ch"},"license":{"name":"GPL-3.0","url":"https://www.gnu.org/licenses/gpl-3.0.html"}},"servers":[{"url":"http://localhost:5232","description":"Test Jungfraujoch system"}],"components":{"parameters":{"binning":{"in":"query","name":"binning","required":false,"schema":{"default":1,"type":"integer"},"description":"Binning of frames for the plot (0 = default binning)"},"experimental_coord":{"in":"query","name":"experimental_coord","required":false,"schema":{"type":"boolean","default":false},"description":"If measurement has goniometer axis defined, plot X-axis will represent rotation angle\nIf measurement has grid scan defined, plot X-axis and Y-axis will represent grid position, Z will be used as the final value\nFor still measurement the number is ignored\n"},"azint_unit":{"in":"query","name":"azint_unit","required":false,"schema":{"type":"string","enum":["Q_recipA","d_A","two_theta_deg"],"default":"Q_recipA"},"description":"Unit used for azim int.\n"},"fill_value":{"in":"query","name":"fill","required":false,"schema":{"type":"number","format":"float"},"description":"Fill value for elements that were missed during data collection\n"},"plot_type":{"in":"query","name":"type","required":true,"description":"Type of requested plot","schema":{"type":"string","enum":["bkg_estimate","spindle_blind_fraction","azint","azint_1d","spot_count","spot_count_low_res","spot_count_indexed","spot_count_ice","indexing_rate","indexing_lattice_count","indexing_unit_cell_length","indexing_unit_cell_angle","profile_radius","mosaicity","b_factor","error_pixels","saturated_pixels","image_collection_efficiency","receiver_delay","receiver_free_send_buf","strong_pixels","roi_sum","roi_mean","roi_max_count","roi_pixels","roi_weighted_x","roi_weighted_y","packets_received","max_pixel_value","resolution_estimate","pixel_sum","processing_time","beam_center_x","beam_center_y","integrated_reflections","image_scale_factor","image_scale_cc","compression_ratio","ice_ring_score"]}},"roi":{"in":"query","name":"roi","required":false,"schema":{"type":"string","minLength":1},"description":"Name of ROI for which plot is requested"},"image_id":{"in":"query","name":"id","required":false,"schema":{"type":"integer","format":"int64","default":-1,"minimum":-2},"description":"Image ID in the image buffer. Special values: -1 - last image in the buffer, -2: last indexed image in the buffer"},"saturation":{"in":"query","name":"saturation","required":false,"schema":{"type":"number","format":"float","minimum":-32767,"maximum":32767},"description":"Saturation value to set contrast in the preview image; if not provided, then autocontrast procedure is used"},"background":{"in":"query","name":"background","required":false,"schema":{"type":"number","format":"float","default":0,"minimum":-32767,"maximum":32767},"description":"Background value to set contrast in the preview image"},"show_spots":{"in":"query","name":"show_spots","schema":{"type":"boolean","default":true},"description":"Show spot finding results on the image"},"show_predictions":{"in":"query","name":"show_predictions","schema":{"type":"boolean","default":false},"description":"Show Bragg spot predictions on the image (if available for the image)"},"show_beam_center":{"in":"query","name":"show_beam_center","schema":{"type":"boolean","default":true},"description":"Show beam center on the image"},"show_roi":{"in":"query","name":"show_roi","schema":{"type":"boolean","default":false},"description":"Show ROI areas on the image"},"jpeg_quality":{"in":"query","name":"jpeg_quality","description":"Quality of JPEG image (100 - highest; 0 - lowest)","schema":{"type":"integer","format":"int64","default":100,"minimum":0,"maximum":100}},"show_user_mask":{"in":"query","name":"show_user_mask","schema":{"type":"boolean","default":false},"description":"Show user mask"},"resolution_ring":{"in":"query","name":"show_res_ring","description":"Show resolution ring, provided in Angstrom","schema":{"type":"number","format":"float","default":0.1,"minimum":0.1,"maximum":100}},"resolution_estimate":{"in":"query","name":"show_res_est","description":"Show resolution estimation as a ring","schema":{"type":"boolean","default":false}},"color_scale":{"in":"query","name":"color","description":"Color scale for preview image","schema":{"type":"string","enum":["indigo","viridis","bw","wb","green","heat","magma","inferno"],"default":"indigo"}}},"schemas":{"grid_scan":{"description":"Definition of a grid scan. Combine it with a goniometer axis to state the angle the spindle\nstood at: send `goniometer` with `step` 0 and the `start` angle of the grid scan, and that\nangle is written per image into the NXmx sample transformation chain. Without one the\nspindle is recorded at 0, which says that nobody stated an angle rather than that the\nspindle stood at 0.\n","type":"object","required":["n_fast","step_x_um","step_y_um"],"properties":{"n_fast":{"type":"integer","format":"int64","minimum":1,"example":20,"description":"Number of elements in the fast direction"},"step_x_um":{"type":"number","format":"float","example":5,"description":"Step in grid along the fast direction. Can be negative. \nPositive number: left to right\nNegative number: right to left\n"},"step_y_um":{"type":"number","format":"float","example":-3,"description":"Step in grid along the slow direction. Can be negative. \nPositive number: top to bottom\nNegative number: bottom to top\n"},"vertical":{"type":"boolean","default":false,"description":"If disabled: fast direction = X, slow direction = Y\nIf enabled: fast direction = Y, slow direction = X\n"},"snake":{"type":"boolean","default":false,"description":"Flip fast direction for every second row\n"}}},"rotation_axis":{"description":"Definition of a crystal rotation axis","type":"object","required":["step","vector"],"properties":{"name":{"type":"string","default":"omega","minLength":1,"description":"Name of rotation axis (e.g., omega, phi)"},"step":{"type":"number","format":"float","example":0.1,"description":"Angle step (per image) in degrees. 0 for an axis that does not turn: the axis then\nrecords the angle the spindle stood at, which is how a grid scan or a set of stills\nstates its head position.\n"},"start":{"type":"number","format":"float","example":50,"description":"Start angle in degrees","default":0},"vector":{"type":"array","description":"Rotation axis","example":[1,0,0],"items":{"type":"number","format":"float"},"minItems":3,"maxItems":3},"helical_step_um":{"type":"array","description":"Translation (per image) for helical scan","example":[-5,-2,0],"items":{"type":"number","format":"float"},"minItems":3,"maxItems":3},"screening_wedge_deg":{"type":"number","format":"float","description":"Wedge angle value; used if rotation per image is smaller than increment between images (so particularly in screening)"}}},"indexing_algorithm":{"type":"string","description":"Selection of an indexing algorithm used by Jungfraujoch\n","enum":["FFBIDX","FFT","FFTW","Auto","None"],"default":"FFBIDX"},"geom_refinement_algorithm":{"type":"string","description":"Selection of an post-indexing least-square diffraction geometry refinement algorithm used by Jungfraujoch.\nBeamCenter - This option is refining both beam center and lattice (restricted to a chosen/detected Bravais lattice).\nOrientationOnly - This option is refining only orientation of the lattice.\nFlex - Tries all per-image refinements and keeps whichever indexes the most spots, letting the pipeline decide (the rugnux flex mode).\n","enum":["BeamCenter","OrientationOnly","Flex","None"]},"integration_model":{"type":"string","description":"Bragg spot integration model.\nProfileGaussian - profile fit with a measured-width Gaussian (Kabsch-style), the default; more\n  accurate intensities than box summation.\nProfileEmpirical - profile fit with a per-resolution-shell empirical profile learned from strong spots.\nBoxSum - classical uniform box summation minus a ring-mean background; the simpler, faster fallback.\n","enum":["ProfileGaussian","ProfileEmpirical","BoxSum"],"default":"ProfileGaussian"},"dataset_settings":{"type":"object","required":["beam_x_pxl","beam_y_pxl","detector_distance_mm","incident_energy_keV"],"properties":{"images_per_trigger":{"type":"integer","format":"int64","minimum":1,"default":1,"description":"For standard synchrotron data collection - this is number of images collected per one TTL trigger\nFor XFEL (pulsed source) - this number is ignored and set to 1\nFor storage cell mode - this number is ignored and set to number of storage cells\n"},"ntrigger":{"type":"integer","format":"int64","default":1,"minimum":1,"description":"Number of TTL trigger that the detector is expected to receive during data collection\n"},"image_time_us":{"type":"integer","format":"int64","minimum":0,"description":"Image time. \nIf not provided (or zero value) the frame time is assumed as default.\nFor JUNGFRAU image time must be multiple of frame time and max value is 256 * frame_time.            \nIn XFEL mode: summation happens for frames collected with multiple triggers.\nIgnored for storage cells and if raw data are saved.\n"},"beam_x_pxl":{"type":"number","format":"float","description":"/entry/detector/beam_center_x in NXmx\nBeam center in X direction [pixels]\n"},"beam_y_pxl":{"type":"number","format":"float","description":"/entry/detector/beam_center_y in NXmx\nBeam center in X direction [pixels]\n"},"detector_distance_mm":{"type":"number","format":"float","minimum":0,"description":"/entry/detector/distance in NXmx Detector distance [mm]"},"incident_energy_keV":{"type":"number","format":"float","minimum":0.001,"maximum":500,"description":"Used to calculate /entry/beam/incident_wavelength in NXmx\nIncident particle (photon, electron) energy in keV\n"},"file_prefix":{"type":"string","default":"","description":"Prefix for filenames. If left empty, no file will be saved."},"images_per_file":{"type":"integer","format":"int64","minimum":1,"description":"Number of images in a single HDF5 data file, taken literally when given.\nIf omitted, it is chosen from the acquisition: a rotation sweep of at most 20000 images\ngoes into a single data file, so the dataset stays readable by programs that follow only\nthe first data file of a legacy master; a grid scan is split on a whole number of fast-axis\nrows; anything else (stills, serial) uses 1000.\n"},"space_group_number":{"type":"integer","format":"int64","minimum":1,"maximum":230,"description":"Number of space group for the crystal. Currently used solely as metadata, not relevant for image processing done in Jungfraujoch."},"sample_name":{"type":"string","default":"","description":"/entry/sample/name in NXmx\nSample name\n"},"compression":{"type":"string","enum":["bslz4","bszstd","bszstd_rle","bszstd_rlehuf","none"],"default":"bslz4","description":"Compression type for the images transferred over ZeroMQ and saved to HDF5 file.\n"},"total_flux":{"type":"number","format":"float","description":"/entry/beam/total_flux in NXmx\nFlux incident on beam plane in photons per second. In other words this is the flux integrated over area. [photons/s]\n"},"transmission":{"type":"number","format":"float","minimum":0,"maximum":1,"description":"/entry/instrument/attenuator/attenuator_transmission\nTransmission of attenuator (filter) [no units]\n"},"beam_size_x_um":{"type":"number","format":"float","minimum":0,"description":"First element of /entry/instrument/beam/incident_beam_size in NXmx\nHorizontal size of the X-ray beam where it meets the sample - the FWHM of a focused beam,\nthe full width of a slit-defined one. [um]\n"},"beam_size_y_um":{"type":"number","format":"float","minimum":0,"description":"Second element of /entry/instrument/beam/incident_beam_size in NXmx\nVertical size of the X-ray beam where it meets the sample. [um]\n"},"goniometer":{"$ref":"#/components/schemas/rotation_axis"},"grid_scan":{"$ref":"#/components/schemas/grid_scan"},"header_appendix":{"description":"Header appendix, added as user_data/user to start ZeroMQ message (can be any valid JSON)\nIn general, it is not saved in HDF5 file.\n\nHowever, if values are placed in \"hdf5\" object, `jfjoch_writer` will write them in /entry/user of the HDF5 file. \nThis applies solely to string and number (double floating-point). No arrays/sub-objects is allowed.\nFor example {\"hdf5\": {\"val1\":1, \"val2\":\"xyz\"}}, will write /entry/user/val1 and /entry/user/val2.\n"},"image_appendix":{"description":"Image appendix, added as user_data to image ZeroMQ message (can be any valid JSON)\nNot saved in HDF5 file\n"},"data_reduction_factor_serialmx":{"type":"number","format":"float","default":1,"minimum":0,"maximum":1,"description":"Rate at which non-indexed images are accepted to be forwarded to writer. \nValue of 1.0 (default) means that all images are written.\nValues below zero mean that non-indexed images will be accepted with a given probability.\n"},"pixel_value_low_threshold":{"type":"integer","format":"int64","minimum":0,"description":"Set all counts lower than the value to zero. \nWhen the value is set, negative numbers other than error pixel value are always set to zero.\nSetting to zero is equivalent to turning the option off.\n"},"run_number":{"type":"integer","format":"int64","minimum":0,"description":"Number of run within an experimental session. \nTransferred over CBOR stream as \"series ID\", though not saved in HDF5 file.\nIt is highly recommended to keep this number unique for each data collection during experimental series.\nIf not provided, the number will be automatically incremented.\n"},"run_name":{"type":"string","description":"Unique ID of run.\nTransferred over CBOR stream as \"unique series ID\", though not saved in HDF5 file.\nIt is highly recommended to keep this name unique for each data collection during experimental series.\nIf not provided, the name will be automatically generated as number + colon + file_prefix.\n"},"experiment_group":{"type":"string","description":"Name of group owning the data (e.g. p-group or proposal number). \nTransferred over CBOR stream, though not saved in HDF5 file.\n"},"poisson_compression":{"type":"integer","format":"int64","minimum":0,"maximum":16,"description":"Enable lossy compression of pixel values that preserves Poisson statistics. \nRequires to provide a numerical factor SQ.\nPixel value P will be transformed to round(sqrt(P) * SQ), with rounding to the closest integer.\nCompression is turned off if the value is missing or it is set to zero.\n"},"write_nxmx_hdf5_master":{"type":"boolean","default":true,"description":"Write NXmx formatted HDF5 master file. Recommended to use for macromolecular crystallography experiments\nand to turn off for other experiments.\n"},"save_calibration":{"type":"boolean","description":"Forward image calibration (at the moment pedestal and pedestal RMS for JUNGFRAU) using the ZeroMQ stream to writer.\nIf parameter is not provided calibration will be saved only if more than 4 images are recorded.\n"},"polarization_factor":{"type":"number","description":"Polarization factor for integration; 1.0 is horizontal polarization; -1.0 is vertical polarization","format":"float","minimum":-1,"maximum":1},"ring_current_mA":{"type":"number","format":"float","description":"Ring current at the beginning of the data collection","minimum":0},"sample_temperature_K":{"type":"number","format":"float","description":"Sample temperature in Kelvin","minimum":0},"poni_rot1_rad":{"type":"number","description":"PONI angle rot1 (see PyFAI documentation for details) in radians","format":"float","minimum":-6.28318530718,"maximum":6.28318530718,"default":0},"poni_rot2_rad":{"type":"number","description":"PONI angle rot2 (see PyFAI documentation for details) in radians","format":"float","minimum":-6.28318530718,"maximum":6.28318530718,"default":0},"poni_rot3_rad":{"type":"number","description":"PONI angle rot3 (see PyFAI documentation for details) in radians","format":"float","minimum":-6.28318530718,"maximum":6.28318530718,"default":0},"unit_cell":{"$ref":"#/components/schemas/unit_cell"},"spot_finding":{"type":"boolean","description":"Enable spot finding and save spots","default":true},"smargon":{"type":"object","description":"Geometry of Smargon goniometer at SLS 2.0 / MX beamlines. \nAssuming that Smargon is used as static positioner and not moving during the scan, allowing to reconstruct geometry.\n","required":["phi_deg","chi_deg"],"properties":{"phi_deg":{"type":"number","format":"float","description":"Phi angle in degrees"},"chi_deg":{"type":"number","format":"float","description":"Chi angle in degrees"},"phi_axis":{"type":"array","description":"Phi rotation axis","default":[1,0,0],"example":[1,0,0],"items":{"type":"number","format":"float"},"minItems":3,"maxItems":3},"chi_axis":{"type":"array","description":"Chi rotation axis","default":[0,0,1],"example":[0,0,1],"items":{"type":"number","format":"float"},"minItems":3,"maxItems":3}}},"max_spot_count":{"type":"integer","minimum":10,"maximum":2000,"default":250,"description":"Maximum number of spots that are saved/used for indexing; spots with highest intensity are selected"},"detect_ice_rings":{"type":"boolean","description":"Flag spots as ice rings and reduce their effect on indexing"},"async_start":{"type":"boolean","default":false,"description":"When set to true, `/start` will not wait for detector and Jungfraujoch to be ready for the measurement."},"xray_fluorescence_spectrum":{"type":"object","required":["energy_eV","data"],"properties":{"energy_eV":{"type":"array","items":{"type":"number","format":"float"},"description":"X-ray fluorescence scan energy for each measurement point"},"data":{"type":"array","items":{"type":"number","format":"float"},"description":"X-ray fluorescence scan result in arbitrary units; must be exactly the same length, as energy_eV"}}}}},"crystal_lattice":{"type":"array","items":{"type":"number","format":"float"},"minItems":9,"maxItems":9,"description":"Real-space crystal lattice 3D vectors in Angstrom.\nOrder is 1st vector (x,y,z), 2nd vector (x,y,z) and 3rd vector (x,y,z)\n"},"unit_cell":{"type":"object","description":"Unit cell parameters. Necessary to run indexing. Units of angstrom and degree","required":["a","b","c","alpha","beta","gamma"],"properties":{"a":{"type":"number","format":"float","example":37,"minimum":0},"b":{"type":"number","format":"float","example":37,"minimum":0},"c":{"type":"number","format":"float","example":78,"minimum":0},"alpha":{"type":"number","format":"float","example":90,"minimum":0,"maximum":360},"beta":{"type":"number","format":"float","example":90,"minimum":0,"maximum":360},"gamma":{"type":"number","format":"float","example":90,"minimum":0,"maximum":360}}},"file_writer_format":{"type":"string","enum":["NXmxOnlyData","NXmxLegacy","NXmxVDS","NXmxIntegrated","CBF","TIFF","NoFileWritten"],"default":"NXmxVDS","description":"NoFileWritten - no files are written at all\nNXmxOnlyData - only data files are written, no master file\nNXmxLegacy - legacy format with soft links to data files in the master file; necessary for DECTRIS Albula 4.0 and DECTRIS Neggia\nNXmxVDS - newer format with virtual dataset linking data files in the master file, also includes better metadata handling\nNXmxIntegrated - single HDF5 per dataset\nCBF - DEPRECATED, no longer supported; kept for back compatibility only. Requests using this value are rejected. Only HDF5 formats are written.\nTIFF - DEPRECATED, no longer supported; kept for back compatibility only. Requests using this value are rejected. Only HDF5 formats are written.\n"},"file_writer_settings":{"type":"object","properties":{"overwrite":{"type":"boolean","default":false,"description":"Inform jfjoch_write to overwrite existing files. Otherwise files would be saved with .h5.{timestamp}.tmp suffix.\n"},"format":{"$ref":"#/components/schemas/file_writer_format"}}},"pixel_mask_statistics":{"type":"object","properties":{"user_mask":{"description":"Number of pixels masked using the user mask","type":"integer","format":"int64","minimum":0},"too_high_pedestal_rms":{"description":"Number of pixels with G0 pedestal RMS higher than provided threshold","type":"integer","format":"int64","minimum":0},"wrong_gain":{"description":"Number of pixels that show wrong gain level during the pedestal procedure","type":"integer","format":"int64","minimum":0}}},"image_buffer_status":{"type":"object","required":["image_numbers","total_slots","in_preparation_slots","in_sending_slots","available_slots","max_image_number","min_image_number"],"properties":{"min_image_number":{"type":"integer","format":"int64","minimum":0,"description":"Smallest image number available in the buffer"},"max_image_number":{"type":"integer","format":"int64","minimum":0,"description":"Largest image number available in the buffer"},"image_numbers":{"type":"array","description":"Image numbers currently present in the buffer.","items":{"type":"integer","format":"int64"}},"total_slots":{"type":"integer","format":"int64","description":"Number of slots in the image buffer. This number, compared to number of images in data collection and\nframe rate will determine \"retention\" rate of the image buffer.\n"},"available_slots":{"type":"integer","format":"int64","description":"Slots available for the data collection"},"in_preparation_slots":{"type":"integer","format":"int64","description":"Number of slots in the image buffer that are currently in preparation for sending.\n"},"in_sending_slots":{"type":"integer","format":"int64","description":"Number of slots in the image buffer that are currently sending/writing data.\n"},"current_counter":{"type":"integer","format":"int64","description":"Counter of changes in the image buffer - either new start message or new image added.\nFor optimization one can only load new images/datasets from the HTTP if this value changes.\nCounter is optional as it was not implemented in older versions to avoid breaking change\n"}}},"image_format_settings":{"type":"object","required":["summation","jungfrau_conversion","geometry_transform","mask_chip_edges","mask_module_edges","apply_mask"],"properties":{"summation":{"type":"boolean","description":"Enable summation of images to a given image_time\nIf disabled images are saved according to original detector speed, but image count is adjusted\n"},"geometry_transform":{"type":"boolean","description":"Place module read-out into their location on composed detector and extend multipixels\n"},"jungfrau_conversion":{"type":"boolean","description":"Convert pixel value in ADU to photon counts/energy\nOnly affects JUNGFRAU detector\n"},"jungfrau_conversion_factor_keV":{"type":"number","format":"float","minimum":0.001,"maximum":500,"description":"Used to convert energy deposited into pixel to counts\nIf not provided incident_energy_keV is used\n"},"bit_depth_image":{"type":"integer","format":"int64","enum":[8,16,32],"description":"Bit depth of resulting image (it doesn't affect the detector read-out value)\nIf not provided value is adjusted automatically\n"},"signed_output":{"type":"boolean","description":"Controls if pixels have signed output\nIf not provided value is adjusted automatically\n"},"mask_module_edges":{"type":"boolean","default":true,"description":"Mask 1 pixel on the module boundary\n"},"mask_chip_edges":{"type":"boolean","default":true,"description":"Mask multipixels on chip boundary\n"},"jungfrau_mask_pixels_without_g0":{"type":"boolean","default":true,"description":"JUNGFRAU: mask pixels that don't operate in G0, but do operate in G1 and G1.\nThis should be turned off for cases, where detector is operated at room temperature with long exposure time.\n"},"apply_mask":{"type":"boolean","default":false,"description":"Masked pixels are set to special value in the images produced by Jungfraujoch\n"},"jungfrau_pedestal_g0_rms_limit":{"type":"integer","format":"int64","default":100,"minimum":0,"description":"Pixels with pedestal G0 RMS above the threshold are marked as masked pixels"}}},"detector_power_state":{"type":"string","description":"Power on of ASICs","enum":["PowerOn","PowerOff","Partial"]},"detector_state":{"type":"string","description":"Current state of the detector","enum":["Idle","Waiting","Busy","Error","Not connected"]},"detector_status":{"type":"object","required":["state","powerchip","server_version","number_of_triggers_left","fpga_temp_degC","high_voltage_V"],"properties":{"state":{"$ref":"#/components/schemas/detector_state"},"powerchip":{"$ref":"#/components/schemas/detector_power_state"},"server_version":{"type":"string","description":"Detector server (on read-out boards) version"},"number_of_triggers_left":{"type":"integer","format":"int64","description":"Remaining triggers to the detector (max of all modules)"},"fpga_temp_degC":{"type":"array","description":"Temperature of detector FPGAs","items":{"type":"integer","format":"int64"}},"high_voltage_V":{"type":"array","description":"High voltage for detector modules","items":{"type":"integer","format":"int64"}}}},"detector_timing":{"type":"string","enum":["auto","trigger","burst","gated"],"default":"trigger"},"detector_settings":{"type":"object","required":["frame_time_us"],"properties":{"frame_time_us":{"type":"integer","description":"Interval between consecutive frames.\nThis is internal frame time for the JUNGFRAU detector, image time has to be integer multiply of this number.\nFor EIGER detector this is default frame time, not used otherwise\n","format":"int64","minimum":1},"count_time_us":{"type":"integer","description":"Integration time of the detector. \nIf not provided count time will be set to maximum value for a given frame time.\n","format":"int64"},"internal_frame_generator":{"type":"boolean","default":false,"description":"Use internal frame generator in FPGA instead of getting data from a real detector"},"internal_frame_generator_images":{"type":"integer","format":"int64","default":1,"minimum":1,"maximum":64,"description":"Number of images stored in the internal frame generator."},"detector_trigger_delay_ns":{"type":"integer","format":"int64","minimum":0,"default":0,"description":"Delay between TTL trigger and acquisition start [ns]"},"timing":{"$ref":"#/components/schemas/detector_timing"},"eiger_threshold_keV":{"type":"number","format":"float","minimum":1,"maximum":100,"description":"Threshold for the PSI EIGER detector and all DECTRIS detectors.\nIf value is provided, it will be used for all subsequent acquisitions, irrespective of beam energy.\nIf value is not provided, threshold will be determined on start of acquisition as half of incident energy. \nThis might lead to increased start time.\n"},"eiger_bit_depth":{"type":"integer","format":"int64","enum":[8,16,32],"description":"Bit depth of PSI EIGER read-out. This is  \nIf value is not provided, depth will be determined based on the image time:\n* Exposure time < 500 microseconds depth of 8 bit will be used,\n* 500 <= exposure time < 2622 microseconds depth of 16 bit will be used\n* Exposure time >= 2622 microseconds depth of 32 bit will be used.\n"},"jungfrau_pedestal_g0_frames":{"type":"integer","format":"int64","default":2000,"minimum":0},"jungfrau_pedestal_g1_frames":{"type":"integer","format":"int64","default":300,"minimum":0},"jungfrau_pedestal_g2_frames":{"type":"integer","format":"int64","default":300,"minimum":0},"jungfrau_pedestal_min_image_count":{"type":"integer","format":"int64","default":128,"minimum":32,"description":"Minimum number of collected images for pedestal to consider it viable"},"jungfrau_storage_cell_count":{"type":"integer","format":"int64","default":1,"minimum":1,"maximum":16},"jungfrau_storage_cell_delay_ns":{"type":"integer","format":"int64","minimum":2100,"default":5000,"description":"Delay between two storage cells [ns]"},"jungfrau_fixed_gain_g1":{"type":"boolean","default":false,"description":"Fix gain to G1 (can be useful for storage cells)"},"jungfrau_use_gain_hg0":{"type":"boolean","default":false,"description":"Use high G0 (for low energy applications)"}}},"spot_finding_settings":{"type":"object","required":["enable","indexing","signal_to_noise_threshold","photon_count_threshold","max_pix_per_spot","min_pix_per_spot","quick_integration","high_resolution_limit_for_spot_count_low_res","ice_ring_width_q_recipA"],"properties":{"enable":{"type":"boolean","default":true,"description":"Enable spot finding. This is temporary setting, i.e. can be changed anytime during data collection. \nEven if disabled spot finding information will still be send and written, though always with zero spots.\n"},"indexing":{"type":"boolean","default":true,"description":"Enable indexing. This is temporary setting, i.e. can be changed anytime during data collection.\n"},"signal_to_noise_threshold":{"type":"number","format":"float","minimum":0},"photon_count_threshold":{"type":"integer","format":"int64","minimum":0},"min_pix_per_spot":{"type":"integer","format":"int64","minimum":1},"max_pix_per_spot":{"type":"integer","format":"int64","minimum":1},"high_resolution_limit":{"type":"number","format":"float","description":"High resolution limit for spot finding [Angstrom]. Optional: if omitted, spot finding extends\nas far as the detector reaches, i.e. the detection is not clipped in resolution.\n"},"low_resolution_limit":{"type":"number","format":"float","description":"Low resolution limit for spot finding [Angstrom]. Optional: if omitted, spot finding is not\nclipped at the low-resolution end. A value of 0 is accepted and means the same thing.\n"},"high_resolution_limit_for_spot_count_low_res":{"type":"number","format":"float","description":"High resolution threshold to consider spot \"low resolution\" [Angstrom]","minimum":2,"maximum":8},"quick_integration":{"type":"boolean","default":false,"description":"Quick integration of Bragg spots in diffraction images.\nIf enabled it will likely reduce performance of Jungfraujoch for datasets with a very high indexing rate.\n(experimental feature)\n"},"ice_ring_width_q_recipA":{"type":"number","format":"float","minimum":0,"maximum":1,"default":0.03,"description":"Half-width of the ice ring band in q (1/A). Matches the offline default in image_analysis/spot_finding/SpotFindingSettings.h, which was set from a measured ring FWHM of ~0.06; the two must agree or the same data gets a narrower ice band online."},"high_res_gap_Q_recipA":{"type":"number","format":"float","minimum":0.1,"maximum":5,"default":1.5,"description":"This parameter is used to remove spurious spots at a very high resolution, that sometimes appear due to very low background close to the edge of the detector.\nIf there is a gap in (1/d)-space between spots of at least this size, spots on the side of the gap with high resolution will be discarded. This is optional parameter.\nThis option should be turned OFF for small molecule datasets or for crystals with very low mosaicity, when it is expected to see only few spots in any case.\n"},"adaptive_threshold":{"type":"boolean","default":false,"description":"Self-calibrating spot detection: replace the fixed photon_count_threshold by a per-resolution-ring\nthreshold derived from each image's own noise, so the same setting works across datasets without\nper-dataset tuning. photon_count_threshold is then ignored and false_pixels_per_frame sets the\noperating point instead.\nOnly available on detectors whose images are analysed in software (the DECTRIS/SIMPLON workflow).\nThe JUNGFRAU and EIGER workflows find spots on the FPGA, which applies its own fixed threshold,\nso enabling this there is rejected rather than silently ignored.\n"},"false_pixels_per_frame":{"type":"number","format":"float","minimum":1,"maximum":100000,"default":100,"description":"Operating point of the adaptive threshold: the number of noise pixels tolerated per frame.\nAbout 100 suits a multi-megapixel detector. Ignored unless adaptive_threshold is set.\n"}}},"azim_int_settings":{"type":"object","required":["solid_angle_corr","polarization_corr","low_q_recipA","q_spacing"],"properties":{"polarization_corr":{"type":"boolean","description":"Apply polarization correction for azimuthal integration (polarization factor must be configured in dataset settings)","default":true},"solid_angle_corr":{"type":"boolean","description":"Apply solid angle correction for azimuthal integration","default":true},"high_q_recipA":{"type":"number","minimum":0.00002,"maximum":10,"format":"float","description":"Upper q limit of the azimuthal integration [1/Angstrom]. Optional: if omitted, the integration\n(and the adaptive spot detection that shares these q bins) extends to the highest q the\ndetector reaches.\n"},"low_q_recipA":{"type":"number","format":"float","minimum":0.00001,"maximum":10},"q_spacing":{"type":"number","format":"float","minimum":0.00001},"azimuthal_bins":{"type":"integer","format":"int64","minimum":1,"maximum":512,"default":1,"description":"Numer of azimuthal (phi) bins; 1 = standard 1D azimuthal integration"},"force_cpu":{"type":"boolean","default":false,"description":"Force CPU processing of azimuthal integration in the FPGA data acquisition workflow.\nThis allows to extend number of azimuthal integration bins, as well as to calculate standard deviation\nof the azimuthal integration results.\n"}}},"detector_list_element":{"type":"object","required":["id","nmodules","description","width","height","serial_number","base_ipv4_addr","udp_interface_count","readout_time_ns","min_frame_time_ns","min_count_time_ns"],"properties":{"id":{"type":"integer","format":"int64","minimum":0},"description":{"type":"string","example":"JUNGFRAU 4 Mpixel"},"serial_number":{"type":"string","example":"JF17T16V01"},"base_ipv4_addr":{"type":"string","example":"10.10.10.1"},"udp_interface_count":{"type":"integer","format":"int64","example":2,"description":"Number of UDP interfaces per detector module"},"nmodules":{"type":"integer","format":"int64","example":18},"width":{"type":"integer","format":"int64","example":2068},"height":{"type":"integer","format":"int64","example":2164},"pixel_size_mm":{"type":"number","format":"float","example":0.075},"readout_time_ns":{"type":"integer","format":"int64"},"min_frame_time_ns":{"type":"integer","format":"int64"},"min_count_time_ns":{"type":"integer","format":"int64"},"type":{"$ref":"#/components/schemas/detector_type"}}},"detector_list":{"type":"object","required":["detectors","current_id"],"properties":{"detectors":{"type":"array","items":{"$ref":"#/components/schemas/detector_list_element"}},"current_id":{"type":"integer","format":"int64","example":0}}},"detector_selection":{"type":"object","required":["id"],"properties":{"id":{"type":"integer","format":"int64","example":1}}},"measurement_statistics":{"type":"object","properties":{"file_prefix":{"type":"string"},"run_number":{"type":"integer","format":"int64","description":"Number of data collection run. This can be either automatically incremented or provided externally for each data collection.\n"},"experiment_group":{"type":"string","description":"Name of group owning the data (e.g. p-group or proposal number).\n"},"images_expected":{"type":"integer","format":"int64"},"images_collected":{"type":"integer","format":"int64","description":"Images collected by the receiver. This number will be lower than images expected if there were issues with data collection performance.\n"},"images_sent":{"type":"integer","format":"int64","description":"Images sent to the writer. \nThe value does not include images discarded by lossy compression filter and images not forwarded due to full ZeroMQ queue.\n"},"images_written":{"type":"integer","format":"int64","description":"Images successfully written to disk.\nThe value is live updated for TCP/IP socket and direct HDF5 writer, while for ZeroMQ it is only updated at the end of experiment.\n"},"images_discarded_lossy_compression":{"type":"integer","format":"int64","description":"Images discarded by the lossy compression filter"},"max_image_number_sent":{"type":"integer","format":"int64"},"collection_efficiency":{"type":"number","format":"float","example":1,"minimum":0,"maximum":1},"compression_ratio":{"type":"number","format":"float","example":5.3,"minimum":0},"cancelled":{"type":"boolean"},"max_receiver_delay":{"type":"integer","format":"int64"},"indexing_rate":{"type":"number","format":"float"},"detector_width":{"type":"integer","format":"int64"},"detector_height":{"type":"integer","format":"int64"},"detector_pixel_depth":{"type":"integer","format":"int64","enum":[2,4]},"bkg_estimate":{"type":"number","format":"float"},"unit_cell":{"type":"string"},"error_pixels":{"type":"number","format":"float","description":"Moving average of 1000 images counting number of error pixels on the detector"},"saturated_pixels":{"type":"number","format":"float","description":"Moving average of 1000 images counting number of saturated pixels on the detector"},"roi_beam_pixels":{"type":"number","format":"float","description":"If there is an ROI defined with name \"beam\", this number will hold moving average of 1000 images\nfor number of valid pixels within this ROI\n"},"roi_beam_sum":{"type":"number","format":"float","description":"If there is an ROI defined with name \"beam\", this number will hold moving average of 1000 images\nfor sum of valid pixels within this ROI\n"}}},"fpga_status":{"type":"array","items":{"type":"object","required":["pci_dev_id","serial_number","base_mac_addr","eth_link_status","eth_link_count","eth_link_speed","power_usage_W","fpga_temp_C","hbm_temp_C","packets_sls","packets_udp","idle","fw_version","pcie_link_speed","pcie_link_width"],"properties":{"pci_dev_id":{"type":"string"},"serial_number":{"type":"string"},"fw_version":{"type":"string"},"base_mac_addr":{"type":"string"},"eth_link_count":{"type":"integer","format":"int64"},"eth_link_status":{"type":"integer","format":"int64"},"power_usage_W":{"type":"number","format":"float"},"fpga_temp_C":{"type":"number","format":"float"},"hbm_temp_C":{"type":"number","format":"float"},"packets_udp":{"type":"integer","format":"int64"},"packets_sls":{"type":"integer","format":"int64"},"idle":{"type":"boolean"},"pcie_link_speed":{"type":"integer","format":"int64","description":"PCIe link speed measured by generation (expected value is 4 == PCIe Gen4)"},"pcie_link_width":{"type":"integer","format":"int64","description":"PCIe link width (expected value is 8 == x8)"}}}},"broker_status":{"type":"object","required":["state"],"properties":{"state":{"type":"string","enum":["Inactive","Idle","Busy","Measuring","Pedestal","Error"]},"progress":{"type":"number","format":"float","description":"Progress of data collection (only available if receiving is running)","example":1,"minimum":0,"maximum":1},"message":{"type":"string","description":"Message to display besides state of the jfjoch_broker; mostly used for errors and warnings\nThis matters especially for async functions (start/initialize), where API won't return reason\nfor the error during async operation.\n"},"message_severity":{"type":"string","enum":["success","info","warning","error"],"default":"error","description":"Level of the message to display"},"gpu_count":{"type":"integer","format":"int32","description":"Number of installed GPUs"},"broker_version":{"type":"string","description":"Version of the jfjoch_broker","example":"1.0.0-rc.128"}}},"image_pusher_status":{"type":"object","required":["pusher_type","addr","connected_writers"],"description":"Informs about status of the image pusher.\n","properties":{"pusher_type":{"$ref":"#/components/schemas/image_pusher_type"},"addr":{"type":"array","items":{"type":"string"},"example":["tcp://1.2.3.4:5000","tcp://1.2.3.4:5001"],"description":"List of addresses of image pushers.\nFor HDF5 socket - no addresses will be returned.\nFor ZeroMQ - list of addresses for each socket will be provided.\nFor TCP/IP - single address to connect all writers will be provided.\n"},"connected_writers":{"type":"integer","format":"int64","minimum":0,"description":"Number of connected writers \nFor ZeroMQ image socket: number is constant\nFor TCP/IP image socket: number is updated live during operation\n"},"images_written":{"type":"integer","format":"int64","minimum":0,"description":"Number of images written to the image socket.\nThis number is updated live during operation for TCP/IP image socket and direct HDF5 writer.\nIt is updated at the end of experiment for ZeroMQ image socket.\n"},"images_write_error":{"type":"integer","format":"int64","minimum":0,"description":"Number of images that could not be written to the image socket.\nThis number is updated live during operation for TCP/IP image socket.\nNo other socket use it.\n"},"writer_fifo_utilization":{"type":"array","items":{"type":"integer","format":"int64","minimum":0},"description":"Utilization of internal writer FIFO.\nThis number is updated live during operation for TCP/IP image socket.\nNo other socket use it.\n"}}},"plot":{"type":"object","required":["x","y","title"],"description":"x and y coordinates for plotting, it is OK to assume that both arrays have the same size; layout is optimized for Plotly","properties":{"title":{"type":"string","default":""},"x":{"type":"array","items":{"type":"number","format":"float"}},"y":{"type":"array","items":{"type":"number","format":"float","nullable":true}},"z":{"type":"array","items":{"type":"number","format":"float","nullable":true}}}},"plot_unit_x":{"type":"string","enum":["image_number","q_recipA","d_A","angle_deg","ADU","grid_um"],"default":"image_number"},"plots":{"type":"object","required":["plot","unit_x"],"properties":{"title":{"type":"string"},"unit_x":{"$ref":"#/components/schemas/plot_unit_x"},"size_x":{"type":"number","format":"float","description":"Max X range of the plot"},"size_y":{"type":"number","format":"float","description":"Max Y range of the plot"},"plot":{"type":"array","items":{"$ref":"#/components/schemas/plot"}}}},"scan_result":{"type":"object","description":"Results of a scan","required":["images"],"properties":{"file_prefix":{"type":"string"},"rotation_unit_cell":{"$ref":"#/components/schemas/unit_cell"},"rotation_crystal_lattice":{"$ref":"#/components/schemas/crystal_lattice"},"rotation_bravais":{"type":"string","description":"Bravais lattice type of the global rotation-indexing solution: crystal-system\nletter + centering, e.g. \"tP\", \"oC\", \"cF\", \"hR\", \"mP\". Empty if not determined.\n"},"images":{"type":"array","items":{"type":"object","required":["efficiency","number"],"properties":{"efficiency":{"type":"number","format":"float"},"number":{"type":"integer","format":"int64","description":"Detector image number for a given cell"},"nx":{"type":"integer","format":"int64","description":"Cell position in X for grid scan"},"ny":{"type":"integer","format":"int64","description":"Cell position in Y for grid scan"},"angle":{"type":"number","format":"float","description":"Rotation angle associated with the image"},"bkg":{"type":"number","format":"float","description":"Background estimate"},"spindle_blind":{"type":"number","format":"float","description":"Fraction (0-1) of a rotation sweep's blind double cone that this orientation makes unrecoverable, assuming the nearest plausible lattice row is a lone 2-fold (a worst-case bound, not an estimate). At 0.5 and above a recovery protocol (second sweep, reorientation) should engage. Absent means the frame could not be assessed, which automation must treat the same as above threshold - it is not a zero.\n"},"spots":{"type":"integer","format":"int64","description":"Spot count"},"spots_low_res":{"type":"integer","format":"int64","description":"Spot count in low resolution range"},"spots_indexed":{"type":"integer","format":"int64","description":"Spot count within indexing tolerance"},"spots_ice":{"type":"integer","format":"int64","description":"Spot count within common ice ring resolutions"},"ice":{"type":"number","format":"float","description":"Strongest hexagonal-ice ring intensity over the smooth radial background (1 = no ice)"},"index":{"type":"integer","format":"int64","description":"Indexing solution"},"latt_count":{"type":"integer","format":"int64","description":"Indexing lattice count"},"pr":{"type":"number","format":"float","description":"Profile radius, i.e. how far reflections are from the Ewald sphere"},"b":{"type":"number","format":"float","description":"B-Factor estimate"},"uc":{"$ref":"#/components/schemas/unit_cell"},"xfel_pulseid":{"type":"integer","format":"int64","description":"XFEL pulse ID"},"pixel_sum":{"type":"integer","format":"int64","description":"Total sum of all pixels"},"max":{"type":"integer","format":"int64","description":"Max viable pixel"},"sat":{"type":"integer","format":"int64","description":"Number of saturated pixels"},"err":{"type":"integer","format":"int64","description":"Number of error pixels"},"res":{"type":"number","format":"float","description":"Diffraction resolution estimate"}}}}}},"powder_calibration_fit_sigma":{"type":"object","description":"What the powder ring fit knows about its own answer, from the covariance of the converged\nproblem. Each sigma is in its parameter's own unit and is scaled by the residual scatter of\nthat fit, so it is the usual \"how far could this move before the fit got visibly worse\".\nThe two correlations are the ones that matter: a tilt and a beam-centre shift both displace a\nring's radius as cos(phi) and are told apart only by how that amplitude grows with the ring's\nradius, so as the rings run out the pair stops being separable and these approach 1.\nThe rotation sigmas and the correlations are absent when the tilt was not a free parameter.\n","properties":{"beam_x_pxl":{"type":"number","format":"float","description":"Standard error of the fitted PONI x [pixels]"},"beam_y_pxl":{"type":"number","format":"float","description":"Standard error of the fitted PONI y [pixels]"},"detector_distance_mm":{"type":"number","format":"float","description":"Standard error of the fitted detector distance [mm]"},"poni_rot1_rad":{"type":"number","format":"float","description":"Standard error of the fitted rot1 [rad]"},"poni_rot2_rad":{"type":"number","format":"float","description":"Standard error of the fitted rot2 [rad]"},"correlation_beam_x_rot1":{"type":"number","format":"float","description":"Correlation between the fitted PONI x and rot1, -1 to 1"},"correlation_beam_y_rot2":{"type":"number","format":"float","description":"Correlation between the fitted PONI y and rot2, -1 to 1"}}},"powder_calibration_spot_check":{"type":"object","description":"Where the circle through the found spots puts the beam, and how far that is from the geometry\nactually fitted. An independent cross-check: it reads nothing from the file's own geometry, so\nit holds where the summed azimuthal profile does not - a profile binned about a badly wrong\ncentre shows each ring smeared across its sectors, and a fit on it converges on the wrong\nanswer without saying so. Two methods sharing no assumption, so the disagreement is the\nstatement. Absent when no spots were available.\n","properties":{"beam_x_pxl":{"type":"number","format":"float","description":"Beam centre x the spots vote for [pixels]"},"beam_y_pxl":{"type":"number","format":"float","description":"Beam centre y the spots vote for [pixels]"},"detector_distance_mm":{"type":"number","format":"float","description":"Detector distance the spots imply [mm]"},"disagreement_pxl":{"type":"number","format":"float","description":"Distance between the spots' beam centre and the fitted one [pixels]"}}},"powder_calibration_quality":{"type":"object","description":"What a powder calibration knows about the geometry it produced. A calibration that has gone\nwrong - the wrong standard named, a header too far out for the rings to be found - looks\nexactly like one that has not until these are read.\n","properties":{"converged":{"type":"boolean","description":"Whether the geometry beside this is a measurement of the data at all. False means at least\none of its parameters was carried over from the input file rather than fitted - which looks\nexactly like a good fit in every other field here - and see not_converged_reason for which.\nrugnux --mode calibration writes no .poni file in that case, a PONI file having no field in\nwhich to say it, and exits non-zero.\n"},"not_converged_reason":{"type":"string","description":"What made converged false, in words. Absent when the calibration converged."},"calibrant":{"type":"string","description":"The powder standard the rings were fitted to, or the unit cell given in its place"},"method":{"type":"string","description":"How the rings were measured. rings fits the arcs of the run-summed (q x azimuth) azimuthal\nprofile; spots fits the pooled per-image spot lists.\n","enum":["rings","spots"]},"ring_points":{"type":"integer","format":"int64","description":"Ring measurements the fit used"},"rms_radial_pxl":{"type":"number","format":"float","description":"Scatter of those measurements about the fitted rings, as a radial distance [pixels]. The\nsingle number that separates a calibration that worked from one that did not.\n"},"beam_sigma_pxl":{"type":"number","format":"float","description":"Standard error the scatter implies on the beam centre [pixels], for a ring of that many\npoints. See powder_calibration_fit_sigma for what the fit itself says, which is not the same and\nis the larger of the two whenever the tilt is poorly separated.\n"},"direct_beam_x_pxl":{"type":"number","format":"float","description":"Where the direct beam lands [pixels]. NOT dataset_settings.beam_x_pxl, which is the PONI:\nthe two part company by distance*tan(tilt)/pixel as soon as the detector is tilted.\n"},"direct_beam_y_pxl":{"type":"number","format":"float","description":"Where the direct beam lands, y [pixels]"},"header_distance_mm":{"type":"number","format":"float","description":"The detector distance the input file declared, for comparison [mm]"},"ring_seed_distance_mm":{"type":"number","format":"float","description":"The distance measured from the ring radii before the fit ran [mm]. It is taken from the\nradii, the wavelength and the pixel size alone, so a large gap from header_distance_mm is\nthe answer to the question the calibration was run to ask. Absent when the profile showed\ntoo few rings to fix a scale.\n"},"tilt_refined":{"type":"boolean","description":"Whether the reported rot1/rot2 were measured by this fit. False means they were declined\nand pinned at the input file's values, because the rings could not separate a tilt from a\nshift of the beam centre.\n"},"tilt_significance":{"type":"number","format":"float","description":"How many of its own sigmas the fitted tilt stands from zero. Below about 3 it is not a\nmeasurement of a tilt but of a beam-centre shift, and the tilt is declined. Passing does\nnot certify a tilt: that estimator is limited by systematics rather than by this sigma.\n"},"fit_sigma":{"$ref":"#/components/schemas/powder_calibration_fit_sigma"},"spot_cross_check":{"$ref":"#/components/schemas/powder_calibration_spot_check"}}},"powder_calibration_output":{"type":"object","required":["dataset_settings"],"description":"The result of a powder-ring detector calibration - what rugnux --mode calibration writes as\n<prefix>.json, and what a calibration run over the image buffer would return.\n\ndataset_settings holds the geometry and nothing else, under the property names this API gives\nthem, so it can be POSTed or merged without translating a field. Its beam_x_pxl/beam_y_pxl is\nthe PONI, the foot of the perpendicular from the sample; where the beam actually lands is\ncalibration.direct_beam_x_pxl. The poni_rot*_rad are present whenever any of them is non-zero\nand absent when all are zero, since a body omitting them states a FLAT detector rather than an\nunstated one.\n","properties":{"dataset_settings":{"$ref":"#/components/schemas/dataset_settings"},"calibration":{"$ref":"#/components/schemas/powder_calibration_quality"},"jfjoch_version":{"type":"string","description":"Version of the program that produced this"}}},"calibration_statistics":{"type":"array","items":{"required":["module_number","storage_cell_number","pedestal_g0_mean","pedestal_g1_mean","pedestal_g2_mean","gain_g0_mean","gain_g1_mean","gain_g2_mean","masked_pixels"],"type":"object","properties":{"module_number":{"type":"integer","format":"int64"},"storage_cell_number":{"type":"integer","format":"int64"},"pedestal_g0_mean":{"type":"number","format":"float"},"pedestal_g1_mean":{"type":"number","format":"float"},"pedestal_g2_mean":{"type":"number","format":"float"},"gain_g0_mean":{"type":"number","format":"float"},"gain_g1_mean":{"type":"number","format":"float"},"gain_g2_mean":{"type":"number","format":"float"},"masked_pixels":{"type":"integer","format":"int64"}}}},"jfjoch_statistics":{"type":"object","description":"Pool statistics for Jungfraujoch to reduce transfers between frontend and jfjoch_broker","properties":{"detector":{"$ref":"#/components/schemas/detector_status"},"detector_list":{"$ref":"#/components/schemas/detector_list"},"detector_settings":{"$ref":"#/components/schemas/detector_settings"},"image_format_settings":{"$ref":"#/components/schemas/image_format_settings"},"instrument_metadata":{"$ref":"#/components/schemas/instrument_metadata"},"file_writer_settings":{"$ref":"#/components/schemas/file_writer_settings"},"data_processing_settings":{"$ref":"#/components/schemas/spot_finding_settings"},"measurement":{"$ref":"#/components/schemas/measurement_statistics"},"broker":{"$ref":"#/components/schemas/broker_status"},"fpga":{"$ref":"#/components/schemas/fpga_status"},"calibration":{"$ref":"#/components/schemas/calibration_statistics"},"zeromq_preview":{"$ref":"#/components/schemas/zeromq_preview_settings"},"zeromq_metadata":{"$ref":"#/components/schemas/zeromq_metadata_settings"},"dark_mask":{"$ref":"#/components/schemas/dark_mask_settings"},"pixel_mask":{"$ref":"#/components/schemas/pixel_mask_statistics"},"roi":{"$ref":"#/components/schemas/roi_definitions"},"az_int":{"$ref":"#/components/schemas/azim_int_settings"},"buffer":{"$ref":"#/components/schemas/image_buffer_status"},"indexing":{"$ref":"#/components/schemas/indexing_settings"},"bragg_integration":{"$ref":"#/components/schemas/bragg_integration_settings"},"image_pusher":{"$ref":"#/components/schemas/image_pusher_status"}}},"error_message":{"type":"object","required":["msg","reason"],"properties":{"msg":{"type":"string","description":"Human readable message","example":"Detector in wrong state"},"reason":{"type":"string","description":"Enumerate field for automated analysis","enum":["WrongDAQState","Other"]}}},"roi_azimuthal":{"type":"object","description":"ROI as Q-range (or resolution range), optionally restricted to an azimuthal-angle sector","required":["name","q_min_recipA","q_max_recipA"],"properties":{"name":{"type":"string","minLength":1,"description":"Name for the ROI; used in the plots"},"q_min_recipA":{"type":"number","format":"float","minimum":0.00001,"description":"Minimum Q-range for the ROI"},"q_max_recipA":{"type":"number","format":"float","minimum":0.00001,"description":"Maximum Q-range for the ROI"},"phi_min_deg":{"type":"number","format":"float","description":"Lower azimuthal-angle bound of the sector [degrees]. Optional: provide both phi_min_deg and phi_max_deg to restrict the ROI to an angular sector, or omit both for a full ring. A sector with phi_min_deg > phi_max_deg wraps across 0.\n"},"phi_max_deg":{"type":"number","format":"float","description":"Upper azimuthal-angle bound of the sector [degrees]. Optional; see phi_min_deg.\n"}}},"roi_circle":{"type":"object","description":"Circular ROI","required":["name","center_x_pxl","center_y_pxl","radius_pxl"],"properties":{"name":{"type":"string","minLength":1,"description":"Name for the ROI; used in the plots"},"center_x_pxl":{"type":"number","format":"float","description":"X coordinate of center of the circle [pixels]"},"center_y_pxl":{"type":"number","format":"float","description":"Y coordinate of center of the circle [pixels]"},"radius_pxl":{"type":"number","format":"float","minimum":0,"exclusiveMinimum":true,"description":"Radius of the circle [pixels]"}}},"roi_box":{"type":"object","description":"Box ROI","required":["name","min_x_pxl","max_x_pxl","min_y_pxl","max_y_pxl"],"properties":{"name":{"type":"string","minLength":1,"description":"Name for the ROI; used in the plots"},"min_x_pxl":{"type":"integer","format":"int64","description":"Lower bound (inclusive) in X coordinate for the box","minimum":0},"max_x_pxl":{"type":"integer","format":"int64","description":"Upper bound (inclusive) in X coordinate for the box","minimum":0},"min_y_pxl":{"type":"integer","format":"int64","description":"Lower bound (inclusive) in Y coordinate for the box","minimum":0},"max_y_pxl":{"type":"integer","format":"int64","description":"Upper bound (inclusive) in Y coordinate for the box","minimum":0}}},"roi_circle_list":{"type":"object","description":"List of circular ROIs","required":["rois"],"properties":{"rois":{"type":"array","maxItems":12,"items":{"$ref":"#/components/schemas/roi_circle"}}}},"roi_box_list":{"type":"object","description":"List of box ROIs","properties":{"rois":{"type":"array","maxItems":12,"items":{"$ref":"#/components/schemas/roi_box"}}}},"roi_azim_list":{"type":"object","description":"List of azimuthal ROIs","properties":{"rois":{"type":"array","maxItems":12,"items":{"$ref":"#/components/schemas/roi_azimuthal"}}}},"roi_definitions":{"type":"object","required":["box","circle","azim"],"description":"ROI defintions","properties":{"box":{"$ref":"#/components/schemas/roi_box_list"},"circle":{"$ref":"#/components/schemas/roi_circle_list"},"azim":{"$ref":"#/components/schemas/roi_azim_list"}}},"dark_mask_settings":{"type":"object","description":"Settings for collection of dark images to be used for mask calculation","required":["detector_threshold_keV","frame_threshold_keV","max_allowed_pixel_count","max_frames_with_signal","frame_time_us","number_of_frames"],"properties":{"detector_threshold_keV":{"type":"number","format":"float","description":"Energy threshold for dark image collection","minimum":2.5,"default":3.5,"maximum":100},"frame_time_us":{"type":"integer","format":"int64","description":"Time between frames for dark image collection","minimum":500,"default":10000,"maximum":100000},"number_of_frames":{"type":"integer","format":"int64","description":"Number of frames for dark image collection; zero means no dark collection","minimum":0,"default":1000},"max_allowed_pixel_count":{"type":"integer","format":"int64","description":"Maximum count in a pixel considered normal (not-masked)","minimum":0,"default":1},"max_frames_with_signal":{"type":"integer","format":"int64","description":"Maximum number of frames with signal in a pixel considered normal (not-masked)","minimum":0,"default":10}}},"indexing_settings":{"type":"object","description":"Settings for crystallography indexing","required":["algorithm","geom_refinement_algorithm","fft_high_resolution_A","fft_max_unit_cell_A","fft_min_unit_cell_A","fft_num_vectors","tolerance","thread_count","unit_cell_dist_tolerance","index_ice_rings","viable_cell_min_spots","rotation_indexing","rotation_indexing_min_angular_range_deg","rotation_indexing_angular_stride_deg","blocking"],"properties":{"algorithm":{"$ref":"#/components/schemas/indexing_algorithm"},"fft_max_unit_cell_A":{"type":"number","format":"float","default":250,"maximum":500,"minimum":50,"description":"Largest unit cell to be indexed by FFT algorithm; parameter value affects execution time of FFT"},"fft_min_unit_cell_A":{"type":"number","format":"float","default":10,"minimum":5,"maximum":40,"description":"Smallest unit cell to be indexed by FFT algorithm; parameter value affects execution time of FFT"},"fft_high_resolution_A":{"type":"number","format":"float","default":2,"minimum":0.5,"maximum":6,"description":"Sets how finely the FFT samples each search direction: it fixes the extent of the projection\nhistogram, and with it the transform size, so it affects execution time and memory of FFT.\nIt does NOT filter spots - every spot is projected whatever its resolution, so raising it\ndoes not make the transform see a coarser subset of the data.\nThere is also correlation between smallest unit cell and this value, which need to be checked for very small systems.\n"},"fft_num_vectors":{"type":"integer","format":"int64","minimum":128,"default":16384,"description":"Number of search directions for the FFT algorithm; parameter value affects execution time of FFT."},"tolerance":{"type":"number","format":"float","minimum":0,"maximum":0.5,"description":"Acceptance tolerance for spots after the indexing run - the larger the number, the more spots will be accepted"},"thread_count":{"type":"integer","format":"int64","minimum":1,"maximum":64,"description":"Thread count for indexing algorithm"},"geom_refinement_algorithm":{"$ref":"#/components/schemas/geom_refinement_algorithm"},"unit_cell_dist_tolerance":{"type":"number","format":"float","minimum":0.0001,"maximum":0.2001,"default":0.05,"description":"Relative distance tolerance for unit cell vs. reference; Lattices outside given tolerance will be ignored"},"viable_cell_min_spots":{"type":"integer","format":"int64","minimum":5,"default":10,"description":"Minimum number of indexed spots required for a cell to be considered viable"},"index_ice_rings":{"type":"boolean","default":false,"description":"Include spots marked as ice rings in the indexing run. \nIf `dataset_settings` doesn't have `detect_ice_rings` on, this option will have no effect on processing.\n"},"rotation_indexing":{"type":"boolean","default":false},"rotation_indexing_min_angular_range_deg":{"type":"number","format":"float","default":20,"minimum":1},"rotation_indexing_angular_stride_deg":{"type":"number","format":"float","default":0.5,"minimum":0},"blocking":{"type":"boolean","default":true,"description":"Indexing in Jungfraujoch goes with a dedicated thread pool.\nIf set to false, the thread pool is non-blocking, i.e. if there are no threads available, image indexing will be skipped. This option is recommended for real-time processing at high frame rates.\nIf set to true, the thread pool will block until a thread is available.\n"}}},"instrument_metadata":{"type":"object","description":"Metadata for a measurement instrument","required":["source_name","instrument_name"],"properties":{"source_name":{"type":"string","example":"Swiss Light Source"},"source_type":{"type":"string","description":"Type of radiation source. NXmx gives a fixed dictionary, though Jungfraujoch is not enforcing compliance. \nhttps://manual.nexusformat.org/classes/base_classes/NXsource.html#nxsource\nNXsource allows the following:\n\nSpallation Neutron Source\nPulsed Reactor Neutron Source\nReactor Neutron Source\nSynchrotron X-ray Source\nPulsed Muon Source\nRotating Anode X-ray\nFixed Tube X-ray\nUV Laser\nFree-Electron Laser\nOptical Laser\nIon Source\nUV Plasma Source\nMetal Jet X-ray\n","example":"Synchrotron X-ray Source","default":""},"instrument_name":{"type":"string","example":"CristallinaMX"},"pulsed_source":{"type":"boolean","description":"Settings specific to XFEL (e.g., every image has to come from TTL trigger, save pulse ID and event code)\n","default":false},"electron_source":{"type":"boolean","description":"Settings specific to electron source (e.g., wavelength definition)\n","default":false}}},"detector_module_direction":{"type":"string","enum":["Xp","Xn","Yp","Yn"]},"detector_type":{"type":"string","enum":["EIGER","JUNGFRAU","DECTRIS"]},"image_pusher_type":{"type":"string","default":"None","enum":["ZeroMQ","HDF5","CBOR","TCP","None"]},"standard_detector_geometry":{"type":"object","description":"Regular rectangular geometry, first module is in the bottom left corner of the detector","required":["nmodules"],"properties":{"nmodules":{"type":"integer","minimum":1,"description":"Number of modules in the detector"},"gap_x":{"type":"integer","default":8,"minimum":0,"description":"Gap size in X direction [pixels]"},"gap_y":{"type":"integer","minimum":0,"default":36,"description":"Gap size in Y direction [pixels]"},"modules_in_row":{"type":"integer","minimum":1,"default":1,"description":"Number of modules in one row"}}},"detector_module":{"type":"object","required":["x0","y0","fast_axis","slow_axis"],"properties":{"x0":{"type":"number"},"y0":{"type":"number"},"fast_axis":{"$ref":"#/components/schemas/detector_module_direction"},"slow_axis":{"$ref":"#/components/schemas/detector_module_direction"}}},"detector":{"type":"object","required":["description"],"properties":{"description":{"type":"string","minLength":1},"serial_number":{"type":"string","default":"Unknown","minLength":1},"type":{"$ref":"#/components/schemas/detector_type"},"high_voltage_V":{"type":"integer","format":"int64","minimum":0,"maximum":200,"default":0},"udp_interface_count":{"type":"integer","format":"int64","minimum":1,"maximum":2,"default":1},"module_sync":{"type":"boolean","default":true,"description":"Use module 0 as master for timing. Only applies to JUNGFRAU detector (this cannot be turned off for EIGER)."},"sensor_thickness_um":{"type":"number","format":"float","minimum":0,"default":320},"readout_time_ns":{"type":"integer","format":"int64","minimum":1,"description":"Minimum difference between frame time and count time in microseconds\nDefaults are 3'000 ns for EIGER and 20'000 ns for JUNGFRAU\n"},"min_count_time_ns":{"type":"integer","format":"int64","minimum":0,"description":"Minimum count time available for the detector."},"min_frame_time_ns":{"type":"integer","format":"int64","minimum":0,"description":"Minimum frame time available for the detector."},"calibration_file":{"type":"array","description":"Can be empty for all detectors - default calibration used.\nFor JUNGFRAU: list of gain files, one entry per module.\nFor EIGER: one directory (with detector settings) or list of trim bit files, one entry per half-module.\n","items":{"type":"string"}},"trim_energies_eV":{"type":"array","description":"List of energies at which trimming calibration is provided.\nOnly needed for PSI EIGER and compulsory in this case\n","items":{"type":"integer","format":"int32","minimum":100}},"hostname":{"type":"array","description":"Hostname for detector module. One entry per module\nOne entry per module. Either empty or number of module entries.\n","items":{"type":"string"}},"sensor_material":{"type":"string","default":"Si"},"tx_delay":{"type":"array","items":{"type":"integer","format":"int64"}},"base_data_ipv4_address":{"type":"string","example":"10.10.10.50"},"standard_geometry":{"$ref":"#/components/schemas/standard_detector_geometry"},"custom_geometry":{"type":"array","items":{"$ref":"#/components/schemas/detector_module"}},"roi_mode":{"type":"string","default":"","description":"ROI setting for DECTRIS detectors"},"mirror_y":{"type":"boolean","default":true,"description":"Mirror detector in Y direction to account for MX convention of (0,0) point in top left corner"},"temp_thresold_degC":{"type":"integer","format":"int64","description":"Temperature threshold for JUNGFRAU detector modules","minimum":40,"maximum":70,"default":55},"default_settings":{"$ref":"#/components/schemas/detector_settings"}}},"zeromq_settings":{"type":"object","description":"ZeroMQ configuration for Jungfraujoch software.\nThis structure is used to provide default settings using configuration JSON file and is not used in HTTP.\n","properties":{"send_watermark":{"type":"integer","format":"int64","minimum":2,"maximum":16384,"default":100,"description":"Watermark for ZeroMQ send queue (number of outstanding messages queued on Jungfraujoch server per queue)"},"send_buffer_size":{"type":"integer","format":"int64","description":"Send buffer size for ZeroMQ socket"},"image_socket":{"type":"array","items":{"type":"string"},"example":["tcp://1.2.3.4:5000","tcp://1.2.3.4:5001"],"description":"PUSH ZeroMQ socket for images. In case multiple sockets are provided, images are streamed over multiple sockets.  \nImages are serialized using CBOR.\nAddress follows ZeroMQ convention for sockets - in practice ipc://<socket file> and tpc://<IP address>:<port> sockets are OK.\n0.0.0.0 instead of IP address is accepted and means listening on all network interfaces.\n"},"writer_notification_socket":{"type":"string","example":"tcp://1.3.4.6:7000","description":"PULL ZeroMQ socket for notifications from writer that it finished operation. \nThis allows Jungfraujoch to operate in a synchronous manner, with end of acquisition being also end of writing.\nAddress follows ZeroMQ convention for sockets - in practice ipc://<socket file> and tpc://<IP address>:<port> sockets are OK.\n0.0.0.0 instead of IP address should be avoided, as this socket address is forwarded to the writer process via START ZerOMQ message and in case of multiple ineterfaces the address might be ambigous.\nUsing * (star) instead of port number is allowed and it means a random free port number.\n"}}},"tcp_settings":{"type":"object","description":"TCP image stream configuration for Jungfraujoch software.\nThis structure is used to provide default settings using configuration JSON file and is not used in HTTP.\n","required":["addr"],"properties":{"send_buffer_size":{"type":"integer","format":"int64","description":"Send buffer size for TCP/IP socket"},"image_socket":{"type":"string","example":"tcp://1.2.3.4:5000","description":"tcp://<IP address>:<port>\n0.0.0.0 instead of IP address is accepted and means listening on all network interfaces\n"},"nwriters":{"type":"integer","format":"int64","minimum":1,"maximum":100,"default":32,"description":"Number of TCP/IP writers to be used for streaming images"},"peer_liveness_timeout_ms":{"type":"integer","format":"int64","description":"Max time (in milliseconds) a send may block with no sign of life from the\nwriter (no BUSY heartbeat or ACK) before the connection is declared dead.\nOptional; the built-in default is used when unset.\n"},"max_backpressure_timeout_ms":{"type":"integer","format":"int64","description":"Hard upper bound (in milliseconds) on backpressure: if no bytes can be sent to\nthe writer for this long the connection is declared dead even while the writer\nkeeps heartbeating, so a wedged writer cannot block the run or its\nfinalization. Optional; the built-in default is used when unset.\n"}}},"pcie_devices":{"type":"array","minLength":1,"items":{"type":"object","required":["block_device"],"properties":{"blk":{"type":"string","example":"/dev/jfjoch0","description":"Block device name"},"ipv4":{"type":"string","example":"10.1.1.7","description":"IPv4 address of the block device"}}}},"bragg_integration_settings":{"type":"object","description":"Settings for Bragg spot integration","required":["integration_model"],"properties":{"integration_model":{"$ref":"#/components/schemas/integration_model"},"max_hkl":{"type":"integer","minimum":1,"maximum":511,"default":100,"description":"How far the Bragg predictor walks the lattice: reflections with |h|,|k|,|l| above this are\nnever predicted. An axis is truncated once a/d_min exceeds it, so a long axis - or a short\none taken to high resolution - loses its outermost reflections. The cost grows as the cube\n(2n+1)^3 of candidates per image, which is why online keeps a fixed, predictable value\ninstead of taking it from whichever crystal is mounted.\n\nOmitting the field selects the default above; it is never interpreted as \"choose per\ncrystal\". The offline tools (rugnux, viewer) do derive it from the refined cell when it is\nleft unset there, but that is their own default and is not reachable through this API.\n"}}},"jfjoch_settings":{"type":"object","required":["detector","frontend_directory","image_pusher"],"description":"Default settings for Jungfraujoch software. \nThis structure is used to provide default settings using configuration JSON file and is not used in HTTP.\n","properties":{"pcie":{"$ref":"#/components/schemas/pcie_devices"},"zeromq":{"$ref":"#/components/schemas/zeromq_settings"},"tcp":{"$ref":"#/components/schemas/tcp_settings"},"instrument":{"$ref":"#/components/schemas/instrument_metadata"},"file_writer":{"$ref":"#/components/schemas/file_writer_settings"},"detector":{"type":"array","minLength":1,"items":{"$ref":"#/components/schemas/detector"}},"indexing":{"$ref":"#/components/schemas/indexing_settings"},"bragg_integration":{"$ref":"#/components/schemas/bragg_integration_settings"},"detector_settings":{"$ref":"#/components/schemas/detector_settings"},"azim_int":{"$ref":"#/components/schemas/azim_int_settings"},"image_format":{"$ref":"#/components/schemas/image_format_settings"},"image_buffer_MiB":{"type":"integer","minimum":128,"default":2048,"description":"Size of internal buffer in MiB for images before they are sent to a stream"},"verbose":{"type":"boolean","default":false,"description":"Print extra debug information"},"receiver_threads":{"type":"integer","minimum":1,"maximum":512,"default":64,"description":"Number of threads used by the receiver"},"numa_policy":{"type":"string","deprecated":true,"description":"Ignored value"},"frontend_directory":{"type":"string","description":"Location of built JavaScript web frontend"},"spot_finding":{"$ref":"#/components/schemas/spot_finding_settings"},"image_pusher":{"$ref":"#/components/schemas/image_pusher_type"},"zeromq_preview":{"$ref":"#/components/schemas/zeromq_preview_settings"},"zeromq_metadata":{"$ref":"#/components/schemas/zeromq_metadata_settings"},"dark_mask":{"$ref":"#/components/schemas/dark_mask_settings"}}},"zeromq_metadata_settings":{"type":"object","required":["enabled","period_ms"],"properties":{"enabled":{"type":"boolean","default":true,"description":"ZeroMQ metadata socket is enabled."},"period_ms":{"type":"integer","format":"int64","minimum":1,"default":1000,"description":"Period for generating metadata package sent to the ZeroMQ interface in milliseconds.\n"},"socket_address":{"type":"string","description":"PUB ZeroMQ socket for image metadata information.\nImage metadata are serialized using CBOR.\nAddress follows ZeroMQ convention for sockets - in practice ipc://<socket file> and tcp://<IP address>:<port> sockets are OK.\n0.0.0.0 instead of IP address is accepted and means listening on all network interfaces.\n"}}},"zeromq_preview_settings":{"type":"object","required":["enabled","period_ms"],"properties":{"enabled":{"type":"boolean","default":true,"description":"ZeroMQ preview socket is enabled."},"period_ms":{"type":"integer","format":"int64","default":1000,"description":"Period for generating preview image sent to the ZeroMQ interface in milliseconds. Default is 1 second. \nIf set to zero, all images will be sent ZeroMQ (should be used only in case of relatively slow data collection).\nThis has no effect on HTTP based preview, which updates always at rate of 1 second.\n"},"socket_address":{"type":"string","description":"PUB ZeroMQ socket for preview images. This socket operates at a reduced frame rate.\nImages are serialized using CBOR.\nAddress follows ZeroMQ convention for sockets - in practice ipc://<socket file> and tcp://<IP address>:<port> sockets are OK.\n0.0.0.0 instead of IP address is accepted and means listening on all network interfaces.\n"}}}}},"paths":{"/initialize":{"post":{"summary":"Initialize detector and data acquisition","description":"Should be used in two cases:\n  - Detector is in `Inactive` state\n  - Detector is in `Error` state\nX-ray shutter must be closed. \nThis operation will reconfigure network interface of the detector. \nDuring operation of the detector it is recommended to use the `POST /pedestal` operation instead.\nIf storage cells are used, the execution time might be few minutes.\n\nThis is async function - one needs to use `POST /wait_till_done` to ensure operation is done.\n","responses":{"200":{"description":"Initialization started"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/pedestal":{"post":{"summary":"Collect dark current for the detector","description":"Updates calibration of the JUNGFRAU detector. Must be in `Idle` state.\n\nX-ray shutter must be closed. Recommended to run once per hour for long integration times (> 100 us).\n\nThis is async function - one needs to use `POST /wait_till_done` to ensure operation is done.\n","responses":{"200":{"description":"Everything OK"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/start":{"post":{"summary":"Start detector","description":"Start data acquisition.\nDetector must be in `Idle` state.\nDefault behavior is for the call to block until detector is ready to accept soft/TTL triggers.\nHowever, this behavior can be changed by settings `async_start` to true in the request body, \nin which case the call will return immediately and one needs to use `/wait_until_running` to ensure detector is ready to run.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/dataset_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/wait_until_running":{"post":{"summary":"Wait for acquisition running","parameters":[{"in":"query","name":"timeout","required":false,"schema":{"type":"integer","default":60,"minimum":0,"maximum":3600},"description":"Timeout in seconds (0 == immediate response)"}],"description":"Block execution of external script till detector and Jungfraujoch are ready to collect data.\nTo not block web server for a indefinite period of time, the procedure is provided with a timeout.\nExtending timeout is possible, but requires to ensure safety that client will not close the connection and retry the connection.\n","responses":{"200":{"description":"Detector in `Measuring` state"},"400":{"description":"Timeout parameter out of bounds"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}},"502":{"description":"Detector is inactive mode"},"504":{"description":"Timeout reached, need to restart operation"}}}},"/wait_till_done":{"post":{"summary":"Wait for acquisition done","parameters":[{"in":"query","name":"timeout","required":false,"schema":{"type":"integer","default":60,"minimum":0,"maximum":3600},"description":"Timeout in seconds (0 == immediate response)"}],"description":"Block execution of external script till initialization, data collection or pedestal is finished.\nRunning this command does not affect (cancel) running data collection, it is only to ensure synchronous execution of other software.\n\nTo not block web server for a indefinite period of time, the procedure is provided with a timeout.\nExtending timeout is possible, but requires to ensure safety that client will not close the connection and retry the connection.\n","responses":{"200":{"description":"Detector in `Idle` state, another data collection can start immediately.\nThe operation that finished either succeeded, was cancelled, or ended with a warning.\n"},"400":{"description":"Timeout parameter out of bounds"},"500":{"description":"Error within Jungfraujoch code, or the operation that finished ended in an error -\nmissing packets, or a writer that could not write - see output message.\nA cancelled data collection is not an error.\n","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}},"502":{"description":"Detector is inactive mode"},"504":{"description":"Timeout reached, need to restart operation"}}}},"/trigger":{"post":{"summary":"Send soft trigger to the detector","description":"Generate soft trigger","responses":{"200":{"description":"Trigger sent"}}}},"/cancel":{"post":{"summary":"Cancel running data collection","description":"Command will inform FPGA network card to stop pedestal or data collection at the current stage.\nAny frame that is currently being processed by CPU will be finished and sent to writer.\nGiven the command is making sure to gracefully stop data acquisition and detector, it might take some time to switch back after command finished to `Idle` state.\n\nIf data collection is not running, the command has no effect.\n","responses":{"200":{"description":"Cancel request sent to FPGAs (or ignored, as data collection is not running)"}}}},"/deactivate":{"post":{"summary":"Prepare detector to turn off","description":"Should be in `Idle` or `Error` state.\nCommand deactivates data acquisition and turns off detector high voltage and ASIC.\nShould be used always before turning off power from the detector.\n","responses":{"200":{"description":"Detector ready to turn off"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/config/detector":{"put":{"summary":"Change detector configuration","description":"Detector settings are ones that have effect on calibration, i.e., pedestal has to be collected again after changing these settings.\nThis can only be done when detector is `Idle`, `Error` or `Inactive` states.\nIf detector is in `Idle` state , pedestal procedure will be executed automatically - there must be no X-rays on the detector during the operation.\nIf detector is in `Inactive` or `Error` states, new settings will be saved, but no calibration will be executed.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/detector_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get detector configuration","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/detector_settings"}}}}}}},"/config/indexing":{"put":{"summary":"Change indexing algorithm settings","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/indexing_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get indexing configuration","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/indexing_settings"}}}}}}},"/config/bragg_integration":{"put":{"summary":"Change Bragg integration settings","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/bragg_integration_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get Bragg integration configuration","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/bragg_integration_settings"}}}}}}},"/config/file_writer":{"put":{"summary":"Change file writer settings","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/file_writer_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get file writer settings","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/file_writer_settings"}}}}}}},"/config/instrument":{"put":{"summary":"Change instrument metadata","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/instrument_metadata"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get instrument metadata","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/instrument_metadata"}}}}}}},"/config/image_format":{"put":{"summary":"Change image output format","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/image_format_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get image output format","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/image_format_settings"}}}}}}},"/config/image_format/raw":{"post":{"summary":"Configure format for raw data collection","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","responses":{"200":{"description":"Everything OK"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/config/image_format/conversion":{"post":{"summary":"Configure format for data collection with full conversion","description":"This can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","responses":{"200":{"description":"Everything OK"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/config/spot_finding":{"put":{"summary":"Configure spot finding","description":"Can be done anytime, also while data collection is running","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/spot_finding_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}},"get":{"summary":"Get data processing configuration","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/spot_finding_settings"}}}}}}},"/config/azim_int":{"put":{"summary":"Configure azimuthal integration","description":"Can be done when detector is Inactive or Idle","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/azim_int_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get azimuthal integration configuration","description":"Can be done anytime","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/azim_int_settings"}}}}}}},"/config/internal_generator_image":{"put":{"summary":"Load binary image for internal FPGA generator","description":"Load image for internal FPGA generator. This can only happen in Idle state of the detector.\nRequires binary blob with 16-bit integer numbers of size of detector in raw/converted coordinates \n(depending on detector settings).\n","parameters":[{"name":"id","in":"query","description":"Image id to upload","required":false,"schema":{"type":"integer","format":"int64","minimum":0,"maximum":127}}],"requestBody":{"content":{"application/octet-stream":{"schema":{"type":"string","format":"binary"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/config/internal_generator_image.tiff":{"put":{"summary":"Load TIFF image for internal FPGA generator","description":"Load image for internal FPGA generator. This can only happen in Idle state of the detector.\nRequires TIFF with 16-bit integer numbers of size of detector in raw/converted coordinates \n(depending on detector settings).\n","parameters":[{"in":"query","name":"id","description":"Image ID to upload","required":false,"schema":{"type":"integer","minimum":0,"maximum":127}}],"requestBody":{"content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/config/select_detector":{"put":{"summary":"Select detector","description":"Jungfraujoch allows to control multiple detectors and/or region-of-interests.\nThe command allows to choose one detector from the list (ID has to be consistent with one provided by GET response).\nChanging detector will set detector to `Inactive` state and will require reinitialization.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/detector_selection"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"List available detectors","description":"Configured detectors that can be selected by used","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/detector_list"}}}}}}},"/config/zeromq_preview":{"put":{"summary":"Set ZeroMQ preview settings","description":"Jungfraujoch can generate preview message stream on ZeroMQ SUB socket.\nHere settings of the socket can be adjusted.\nWhile the data structure contains also socket_address, this cannot be changed via HTTP and is ignore in PUT request.\nOptions set with this PUT request have no effect on HTTP based preview.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/zeromq_preview_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get ZeroMQ preview settings","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/zeromq_preview_settings"}}}}}}},"/config/zeromq_metadata":{"put":{"summary":"Set ZeroMQ metadata settings","description":"Jungfraujoch can generate metadata message stream on ZeroMQ PUB socket. This stream covers all images.\nHere settings of the socket can be adjusted.\nWhile the data structure contains also socket_address, this cannot be changed via HTTP and is ignore in PUT request.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/zeromq_metadata_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get ZeroMQ metadata socket settings","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/zeromq_metadata_settings"}}}}}}},"/config/dark_mask":{"put":{"summary":"Set configuration for dark data collection to calculate mask","description":"This is only possible when operating DECTRIS detectors at the moment; it will be also available for PSI EIGER at some point.\nThis can only be done when detector is `Idle`, `Error` or `Inactive` states.\n","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/dark_mask_settings"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}},"get":{"summary":"Get settings for dark data collection to calculate mask","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/dark_mask_settings"}}}}}}},"/status":{"get":{"summary":"Get Jungfraujoch status","description":"Status of the data acquisition","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/broker_status"}}}}}}},"/fpga_status":{"get":{"summary":"Get status of FPGA devices","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/fpga_status"}}}}}}},"/xfel/pulse_id":{"get":{"summary":"Return XFEL pulse IDs for the current data acquisition","description":"Return array of XFEL pulse IDs - (-1) if image not recorded","responses":{"200":{"description":"Pulse ID collected","content":{"application/json":{"schema":{"type":"array","items":{"type":"integer","format":"int64"}}}}},"404":{"description":"Not in XFEL mode or no acquisition recorded"}}}},"/xfel/event_code":{"get":{"summary":"Return XFEL event codes for the current data acquisition","description":"Return array of XFEL event codes","responses":{"200":{"description":"Event codes collected","content":{"application/json":{"schema":{"type":"array","items":{"type":"integer","format":"int64"}}}}},"404":{"description":"Not in XFEL mode or no acquisition recorded"}}}},"/image_pusher/status":{"get":{"summary":"Get status of image pusher","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/image_pusher_status"}}}},"500":{"description":"Error encountered when trying to read status","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/detector/status":{"get":{"summary":"Get detector status","description":"Status of the JUNGFRAU detector","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/detector_status"}}}},"404":{"description":"Running in \"simulator\" mode - no detector present"},"500":{"description":"Error encountered when trying to read status","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/config/roi":{"get":{"summary":"Get ROI definitions","responses":{"200":{"description":"OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/roi_definitions"}}}}}},"put":{"summary":"Upload ROI definitions","requestBody":{"content":{"application/json":{"schema":{"$ref":"#/components/schemas/roi_definitions"}}}},"responses":{"200":{"description":"Everything OK"},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/statistics":{"get":{"summary":"Get general statistics","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/jfjoch_statistics"}}}}}}},"/statistics/data_collection":{"get":{"summary":"Get data collection statistics","description":"Results of the last data collection","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/measurement_statistics"}}}},"404":{"description":"No data collection performed so far"}}}},"/statistics/calibration":{"get":{"summary":"Get calibration statistics","description":"Statistics are provided for each module/storage cell separately","responses":{"200":{"description":"Everything OK","content":{"application/json":{"schema":{"$ref":"#/components/schemas/calibration_statistics"}}}}}}},"/config/mask":{"get":{"summary":"Get mask of the detector (binary)","description":"Detector must be Initialized.\nGet full pixel mask of the detector.\nSee NXmx standard for meaning of pixel values.\n","responses":{"200":{"description":"Binary array (4 byte; unsigned)","content":{"application/octet-stream":{"schema":{"type":"string","format":"binary"}}}}}}},"/config/user_mask":{"get":{"summary":"Detector must be Initialized.\nGet user mask of the detector (binary)\n","description":"Get user pixel mask of the detector in the actual detector coordinates: 0 - good pixel, 1 - masked","responses":{"200":{"description":"User mask in binary format (4 byte; unsigned)","content":{"application/octet-stream":{"schema":{"type":"string","format":"binary"}}}}}},"put":{"summary":"Upload user mask of the detector (binary)","description":"Should be in `Idle` state.\nUpload user mask of the detector - this is for example to account for beam stop shadow or misbehaving regions.\nIf detector is conversion mode the mask can be both in raw (1024x512; stacked modules) or converted coordinates.\nIn the latter case - module gaps are ignored and don't need to be assigned value.\nMask is expected as binary array (4-byte; unsigned).\n0 - good pixel, other value - masked\nUser mask is stored in NXmx pixel mask (bit 8), as well as used in spot finding and azimuthal integration.\n","requestBody":{"content":{"application/octet-stream":{"schema":{"type":"string","format":"binary"}}}},"responses":{"200":{"description":"All good"},"400":{"description":"Mask is not 4-byte unsigned integer array or empty body"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/config/mask.tiff":{"get":{"summary":"Get mask of the detector (TIFF)","description":"Should be in `Idle` state.\nGet full pixel mask of the detector\nSee NXmx standard for meaning of pixel values\n","responses":{"200":{"description":"Pixel mask in TIFF format (4 byte; unsigned)","content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}}}}},"/config/user_mask.tiff":{"get":{"summary":"Detector must be Initialized.\nGet user mask of the detector (TIFF)\n","description":"Get user pixel mask of the detector in the actual detector coordinates: 0 - good pixel, 1 - masked","responses":{"200":{"description":"User mask in TIFF format (4 byte; unsigned)","content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}}}},"put":{"summary":"Upload user mask of the detector","description":"Should be in `Idle` state.\nUpload user mask of the detector - this is for example to account for beam stop shadow or misbehaving regions.\nIf detector is conversion mode the mask can be both in raw (1024x512; stacked modules) or converted coordinates.\nIn the latter case - module gaps are ignored and don't need to be assigned value.\nMask is expected as a single-channel TIFF (8-, 16- or 32-bit integer, signed or unsigned).\n0 - good pixel, other value - masked\nUser mask is stored in NXmx pixel mask (bit 8), as well as used in spot finding and azimuthal integration.\nUser mask is not automatically applied - i.e. pixels with user mask will have a valid pixel value in the images.\n","requestBody":{"content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}},"responses":{"200":{"description":"All good"},"400":{"description":"Not a valid single-channel TIFF or size doesn't match the detector"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/preview/pedestal.tiff":{"get":{"parameters":[{"in":"query","name":"gain_level","required":true,"schema":{"type":"integer"},"description":"Gain level (0, 1, 2)"},{"in":"query","name":"sc","schema":{"type":"integer"},"description":"Storage cell number"}],"summary":"Get pedestal in TIFF format","responses":{"200":{"description":"Calibration image","content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}},"400":{"description":"Invalid gain level or storage cell number"},"404":{"description":"No calibration recorded so far"}}}},"/preview/plot":{"get":{"summary":"Generate 1D plot from Jungfraujoch","parameters":[{"$ref":"#/components/parameters/binning"},{"$ref":"#/components/parameters/plot_type"},{"$ref":"#/components/parameters/fill_value"},{"$ref":"#/components/parameters/experimental_coord"},{"$ref":"#/components/parameters/azint_unit"}],"responses":{"200":{"description":"Everything OK.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/plots"}}}},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/preview/plot.bin":{"get":{"summary":"Generate 1D plot from Jungfraujoch and send in raw binary format.\nData are provided as (32-bit) float binary array.\nThis format doesn't transmit information about X-axis, only values, so it is of limited use for azimuthal integration.\n","parameters":[{"$ref":"#/components/parameters/plot_type"},{"$ref":"#/components/parameters/roi"}],"responses":{"200":{"description":"Everything OK.","content":{"application/octet-stream":{"schema":{"type":"string","format":"binary"}}}},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}}}}},"/result/scan":{"get":{"summary":"Get full scan result","responses":{"200":{"description":"Everything OK.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/scan_result"}}}},"404":{"description":"No grid scan recorded"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/image_buffer/start.cbor":{"get":{"summary":"Get Start message in CBOR format","description":"Contains metadata for a dataset (e.g., experimental geometry)","responses":{"200":{"description":"Return start message","content":{"application/cbor":{"schema":{"type":"string","format":"binary"}}}},"404":{"description":"No measurement so far"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/image_buffer/image.cbor":{"get":{"summary":"Get image message in CBOR format","description":"Contains full image data and metadata. The image must come from the latest data collection.","parameters":[{"$ref":"#/components/parameters/image_id"}],"responses":{"200":{"description":"Return image message","content":{"application/cbor":{"schema":{"type":"string","format":"binary"}}}},"404":{"description":"Image not present in the buffer - either not yet measured or already replaced by a next image."},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/image_buffer/image.jpeg":{"get":{"summary":"Get preview image in JPEG format using custom settings","parameters":[{"$ref":"#/components/parameters/image_id"},{"$ref":"#/components/parameters/show_user_mask"},{"$ref":"#/components/parameters/show_roi"},{"$ref":"#/components/parameters/show_spots"},{"$ref":"#/components/parameters/show_predictions"},{"$ref":"#/components/parameters/show_beam_center"},{"$ref":"#/components/parameters/saturation"},{"$ref":"#/components/parameters/jpeg_quality"},{"$ref":"#/components/parameters/resolution_ring"},{"$ref":"#/components/parameters/color_scale"},{"$ref":"#/components/parameters/resolution_estimate"}],"responses":{"200":{"description":"Preview image","content":{"image/jpeg":{"schema":{"type":"string","format":"binary"}}}},"400":{"description":"Input parsing or validation error","content":{"text/plain":{"schema":{"type":"string","description":"Exception error"}}}},"404":{"description":"Image not present in the buffer - either not yet measured or already replaced by a next image."},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/image_buffer/image.tiff":{"get":{"summary":"Get preview image in TIFF format","parameters":[{"$ref":"#/components/parameters/image_id"}],"responses":{"200":{"description":"Preview image","content":{"image/tiff":{"schema":{"type":"string","format":"binary"}}}},"404":{"description":"No preview image recorded so far"}}}},"/image_buffer/clear":{"post":{"summary":"Clear image buffer","description":"Turns off image buffer for the last data collection. Can be only run when Jungfraujoch is not collecting data.","responses":{"200":{"description":"Done"},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/image_buffer/status":{"get":{"summary":"Get status of the image buffers","description":"Can be run at any stage of Jungfraujoch operation, including during data collection.\nThe status of the image buffer is volatile during data collection - if data collection goes for more images than available buffer slots,\nthen image might be replaced in the buffer between calling /images and /image.cbor.\n","responses":{"200":{"description":"Done","content":{"application/json":{"schema":{"$ref":"#/components/schemas/image_buffer_status"}}}},"500":{"description":"Error within Jungfraujoch code - see output message.","content":{"application/json":{"schema":{"$ref":"#/components/schemas/error_message"}}}}}}},"/version":{"get":{"summary":"Get Jungfraujoch version of jfjoch_broker","responses":{"200":{"description":"Release number of Jungfraujoch","content":{"text/plain":{"schema":{"type":"string","example":"1.0.0-rc.25"}}}}}}}}}},"searchIndex":{"store":["section/License-Clarification","/paths/~1initialize/post","/paths/~1pedestal/post","/paths/~1start/post","/paths/~1wait_until_running/post","/paths/~1wait_till_done/post","/paths/~1trigger/post","/paths/~1cancel/post","/paths/~1deactivate/post","/paths/~1config~1detector/put","/paths/~1config~1detector/get","/paths/~1config~1indexing/put","/paths/~1config~1indexing/get","/paths/~1config~1bragg_integration/put","/paths/~1config~1bragg_integration/get","/paths/~1config~1file_writer/put","/paths/~1config~1file_writer/get","/paths/~1config~1instrument/put","/paths/~1config~1instrument/get","/paths/~1config~1image_format/put","/paths/~1config~1image_format/get","/paths/~1config~1image_format~1raw/post","/paths/~1config~1image_format~1conversion/post","/paths/~1config~1spot_finding/put","/paths/~1config~1spot_finding/get","/paths/~1config~1azim_int/put","/paths/~1config~1azim_int/get","/paths/~1config~1internal_generator_image/put","/paths/~1config~1internal_generator_image.tiff/put","/paths/~1config~1select_detector/put","/paths/~1config~1select_detector/get","/paths/~1config~1zeromq_preview/put","/paths/~1config~1zeromq_preview/get","/paths/~1config~1zeromq_metadata/put","/paths/~1config~1zeromq_metadata/get","/paths/~1config~1dark_mask/put","/paths/~1config~1dark_mask/get","/paths/~1status/get","/paths/~1fpga_status/get","/paths/~1xfel~1pulse_id/get","/paths/~1xfel~1event_code/get","/paths/~1image_pusher~1status/get","/paths/~1detector~1status/get","/paths/~1config~1roi/get","/paths/~1config~1roi/put","/paths/~1statistics/get","/paths/~1statistics~1data_collection/get","/paths/~1statistics~1calibration/get","/paths/~1config~1mask/get","/paths/~1config~1user_mask/get","/paths/~1config~1user_mask/put","/paths/~1config~1mask.tiff/get","/paths/~1config~1user_mask.tiff/get","/paths/~1config~1user_mask.tiff/put","/paths/~1preview~1pedestal.tiff/get","/paths/~1preview~1plot/get","/paths/~1preview~1plot.bin/get","/paths/~1result~1scan/get","/paths/~1image_buffer~1start.cbor/get","/paths/~1image_buffer~1image.cbor/get","/paths/~1image_buffer~1image.jpeg/get","/paths/~1image_buffer~1image.tiff/get","/paths/~1image_buffer~1clear/post","/paths/~1image_buffer~1status/get","/paths/~1version/get"],"index":{"version":"2.3.9","fields":["title","description"],"fieldVectors":[["title/0",[0,4.111,1,4.753]],["description/0",[0,1.805,2,4.17,3,2.159,4,2.087,5,1.193,6,3.337,7,1.193,8,1.193,9,1.032,10,0.926,11,1.621,12,1.193,13,0.963,14,1.193,15,1.619,16,1.193,17,2.781,18,2.087,19,0.926,20,2.087,21,1.278,22,1.193,23,2.087,24,1.032,25,2.781,26,1.193,27,1.193,28,2.087,29,1.193,30,1.193,31,1.193,32,1.193,33,1.193,34,1.193,35,1.193,36,2.781,37,1.193,38,1.193,39,0.354,40,0.611,41,1.193,42,2.087,43,1.032,44,1.193,45,1.193,46,1.193,47,1.193,48,1.193,49,1.193,50,1.032,51,1.193,52,1.193,53,1.193,54,1.193,55,1.193,56,1.193,57,1.193,58,1.193,59,0.926,60,0.926,61,1.193]],["title/1",[62,2.314,63,0.416,64,0.989,65,1.935]],["description/1",[11,2.226,39,0.937,43,1.688,59,1.515,62,1.195,63,0.505,66,1.952,67,1.385,68,2.042,69,0.858,70,0.901,71,1.515,72,1.688,73,1.385,74,3.01,75,1.952,76,1.515,77,1.688,78,2.735,79,1.195,80,1.952,81,1.952,82,1.688,83,1.385,84,1.281,85,1.952,86,1.952,87,1.688,88,1.688,89,1.281,90,1.281,91,1.515,92,1.281,93,0.555]],["title/2",[63,0.416,94,1.384,95,2.932,96,2.681]],["description/2",[11,1.242,39,0.758,63,0.282,68,2.004,71,1.984,72,2.212,73,1.814,74,1.679,77,2.212,78,2.212,79,1.566,84,1.679,87,2.212,88,2.212,89,1.679,90,1.679,91,1.984,92,1.679,93,0.727,97,2.557,98,1.984,99,2.212,100,0.824,101,1.31,102,2.557,103,2.557,104,2.557,105,2.557,106,1.385,107,2.557]],["title/3",[63,0.524,108,3.688]],["description/3",[11,1.132,39,0.691,60,2.827,63,0.494,64,0.61,65,1.194,67,1.654,89,1.531,90,1.531,92,1.531,100,0.751,101,1.194,108,2.827,109,2.331,110,3.642,111,1.809,112,2.331,113,3.15,114,2.331,115,2.331,116,1.809,117,1.076,118,0.783,119,2.331,120,2.331,121,1.809,122,2.331,123,1.531,124,2.331,125,2.016]],["title/4",[65,2.156,101,2.156,126,3.641]],["description/4",[15,1.984,21,1.566,63,0.282,64,0.67,73,1.814,83,1.814,84,1.679,92,1.679,94,0.937,111,3.036,113,2.212,125,2.212,127,2.212,128,2.212,129,2.212,130,1.242,131,2.212,132,2.212,133,2.212,134,2.212,135,1.984,136,1.679,137,3.384,138,2.212,139,1.984,140,2.212,141,3.384,142,2.212]],["title/5",[65,2.156,93,1.197,126,3.641]],["description/5",[15,1.636,21,1.291,62,1.291,64,0.881,73,1.496,79,1.291,83,2.387,84,1.384,91,1.636,92,2.209,94,1.232,101,1.723,111,2.61,127,1.823,128,1.823,129,1.823,131,1.823,132,1.823,133,1.823,134,1.823,135,1.636,136,1.384,137,2.909,138,1.823,139,1.636,140,1.823,141,2.909,142,1.823,143,1.823,144,1.496,145,2.107,146,1.636,147,2.107,148,2.107]],["title/6",[63,0.416,116,2.932,149,3.268,150,3.268]],["description/6",[13,2.476,116,5.063,150,4.639]],["title/7",[64,0.989,94,1.384,101,1.935,146,2.932]],["description/7",[39,0.625,59,1.636,63,0.232,64,1.099,65,1.079,79,1.291,84,1.384,94,1.232,96,2.387,100,0.679,101,1.079,143,2.909,144,3.4,146,1.636,151,1.823,152,1.291,153,2.107,154,2.61,155,1.823,156,2.107,157,2.107,158,1.823,159,2.107,160,2.107,161,1.636,162,2.107,163,2.107,164,2.107,165,2.107,166,2.107,167,2.107,168,2.107,169,1.636]],["title/8",[63,0.464,170,4.21,171,3.267]],["description/8",[11,1.618,39,0.987,63,0.524,64,0.872,65,1.706,70,1.538,100,1.073,144,2.364,171,3.693,172,4.759,173,3.331,174,3.331,175,3.331,176,3.331,177,3.331,178,3.331]],["title/9",[63,0.464,117,1.944,179,1.851]],["description/9",[39,1.271,63,0.586,68,1.768,69,1.518,70,1.594,71,1.69,74,1.429,76,1.69,79,2.114,83,2.449,89,1.429,93,0.619,94,0.797,98,2.679,100,1.112,117,1.005,118,1.441,135,1.69,169,1.69,180,1.883,181,2.177,182,1.883,183,2.177,184,2.177,185,1.883]],["title/10",[63,0.524,179,2.09]],["description/10",[93,1.59,185,4.835,186,2.863]],["title/11",[117,1.745,118,1.27,187,3.268,188,3.778]],["description/11",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,189,4.135]],["title/12",[179,2.09,187,4.111]],["description/12",[93,1.59,186,2.863,189,4.835]],["title/13",[106,2.046,117,1.745,118,1.27,190,3.268]],["description/13",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,191,4.135]],["title/14",[106,2.28,179,1.851,190,3.641]],["description/14",[93,1.59,186,2.863,191,4.835]],["title/15",[10,2.932,117,1.745,118,1.27,161,2.932]],["description/15",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,192,4.135]],["title/16",[10,3.267,118,1.415,161,3.267]],["description/16",[93,1.59,186,2.863,192,4.835]],["title/17",[117,1.944,193,3.641,194,2.419]],["description/17",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,195,4.135]],["title/18",[193,4.111,194,2.731]],["description/18",[93,1.59,186,2.863,195,4.835]],["title/19",[117,1.745,196,1.27,197,3.268,198,1.835]],["description/19",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,199,4.135]],["title/20",[196,1.415,197,3.641,198,2.045]],["description/20",[93,1.59,186,2.863,199,4.835]],["title/21",[64,0.897,94,1.255,179,1.507,198,1.665,200,2.432]],["description/21",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,201,4.78]],["title/22",[64,0.821,94,1.149,179,1.379,198,1.523,202,2.059,203,2.433]],["description/22",[39,1.417,63,0.527,69,2.102,70,2.207,93,1.359,100,1.54,204,4.78]],["title/23",[179,1.851,205,3.267,206,3.267]],["description/23",[64,1.299,93,1.41,94,1.817,101,2.54,186,2.54,207,4.29]],["title/24",[64,1.102,158,3.641,179,1.851]],["description/24",[93,1.59,186,2.863,207,4.835]],["title/25",[106,2.28,179,1.851,208,2.764]],["description/25",[63,0.568,69,2.266,93,1.465,100,1.66,209,4.458]],["title/26",[106,2.28,179,1.851,208,2.764]],["description/26",[93,1.59,186,2.863,209,4.835]],["title/27",[13,1.448,152,1.92,196,1.054,210,2.225,211,1.802,212,2.225]],["description/27",[13,1.397,21,1.853,39,0.897,63,0.579,100,0.975,118,1.017,152,1.853,196,1.017,210,2.147,211,1.739,212,2.147,213,2.617,214,3.026,215,2.617,216,2.348,217,2.617,218,2.617,219,2.617,220,1.853,221,2.617,222,3.026]],["title/28",[13,1.448,152,1.92,196,1.054,210,2.225,212,2.225,223,1.802]],["description/28",[13,1.43,21,1.897,39,0.918,63,0.587,100,0.998,118,1.041,152,1.897,196,1.041,210,2.198,212,2.198,213,2.679,215,2.679,216,2.403,217,2.679,218,2.679,219,2.679,220,1.897,221,2.679,223,1.78,224,3.097]],["title/29",[63,0.524,225,4.111]],["description/29",[21,1.698,24,2.397,39,0.821,50,3.597,63,0.611,69,1.219,89,2.731,117,1.28,118,0.932,130,1.346,136,1.82,144,1.967,226,2.771,227,2.771,228,2.771,229,2.771,230,2.397,231,2.151,232,2.771,233,2.771,234,2.771,235,2.397]],["title/30",[63,0.464,230,3.641,236,3.267]],["description/30",[11,2.503,63,0.568,179,2.266,225,4.458,235,4.458]],["title/31",[118,1.747,237,2.314,238,2.481]],["description/31",[13,1.181,64,0.67,117,1.181,118,1.315,121,3.036,130,1.242,169,1.984,237,1.566,238,2.569,239,1.814,240,2.212,241,2.557,242,3.036,243,2.212,244,2.212,245,2.212,246,1.814,247,2.212,248,2.212,249,3.384,250,1.814,251,3.384,252,2.557,253,2.557,254,2.212]],["title/32",[118,1.415,237,2.579,238,2.764]],["description/32",[254,5.283]],["title/33",[118,1.747,194,2.171,237,2.314]],["description/33",[13,1.307,64,0.741,117,1.307,118,0.951,121,2.197,130,1.375,194,1.627,196,0.951,237,1.734,239,2.009,240,3.655,242,3.279,243,2.449,244,2.449,245,2.449,246,2.009,247,2.449,248,2.449,249,2.449,250,2.009,251,2.449,255,2.831,256,2.831,257,2.449]],["title/34",[118,1.27,194,2.171,237,2.314,242,2.932]],["description/34",[257,5.283]],["title/35",[64,0.757,94,1.059,95,2.243,118,0.971,179,1.271,258,2.5,259,1.157]],["description/35",[39,1.068,63,0.554,69,1.585,70,1.664,74,2.367,93,1.025,100,1.161,139,2.797,236,2.797,260,3.604,261,3.604,262,3.604,263,3.604,264,3.604,265,3.118]],["title/36",[64,0.821,94,1.149,95,2.433,118,1.054,258,2.712,259,1.256]],["description/36",[265,5.283]],["title/37",[130,2.309,266,2.574]],["description/37",[64,1.404,65,2.747,266,3.533]],["title/38",[152,2.579,266,2.28,267,4.21]],["description/38",[268,6.108]],["title/39",[64,0.757,65,1.48,96,2.051,123,1.897,231,2.243,269,2.051,270,2.5]],["description/39",[68,2.208,123,2.831,196,1.449,231,3.346,269,3.06,270,3.729,271,3.06,272,3.346,273,4.311,274,4.311]],["title/40",[19,2.243,64,0.757,65,1.48,96,2.051,123,1.897,269,2.051,275,2.5]],["description/40",[19,3.849,123,3.257,269,3.52,271,3.52,275,4.29,276,4.959]],["title/41",[196,1.415,266,2.28,277,4.21]],["description/41",[278,6.108]],["title/42",[63,0.524,266,2.574]],["description/42",[63,0.591,99,4.639,266,2.905,279,5.363]],["title/43",[3,3.688,280,4.111]],["description/43",[281,5.283]],["title/44",[3,3.267,280,3.641,282,2.764]],["description/44",[281,5.283]],["title/45",[13,2.194,283,3.121]],["description/45",[283,4.011]],["title/46",[64,1.102,94,1.542,283,2.764]],["description/46",[64,1.349,94,1.888,284,4.458,285,4.458,286,5.153]],["title/47",[98,3.688,283,3.121]],["description/47",[82,4.135,136,3.139,283,3.139,287,4.78,288,4.78,289,4.78,290,4.78]],["title/48",[63,0.464,211,2.419,259,1.686]],["description/48",[62,2.405,63,0.588,202,2.578,259,1.572,291,3.268,292,3.396,293,2.786,294,3.396,295,3.396,296,2.578,297,3.926]],["title/49",[40,1.606,62,1.92,63,0.502,211,1.802,259,1.256]],["description/49",[40,1.898,63,0.565,68,2.627,220,2.27,259,2.054,272,2.876,291,3.141,298,3.205,299,2.63,300,2.63,301,3.205]],["title/50",[40,1.755,63,0.378,211,1.969,259,1.372,282,2.25]],["description/50",[11,0.767,39,0.468,40,1.359,63,0.292,67,1.12,68,2.061,90,1.036,100,0.508,106,0.855,154,1.225,200,1.12,203,1.225,205,1.225,206,1.225,208,1.036,211,0.907,220,0.967,250,1.12,259,1.947,271,1.12,282,1.036,291,1.625,293,1.12,296,1.742,299,1.12,300,1.12,301,1.365,302,1.365,303,1.365,304,1.365,305,1.365,306,1.365,307,1.365,308,1.365,309,1.365,310,1.365,311,1.365,312,2.295,313,1.365,314,1.365,315,1.365,316,1.365,317,1.365,318,1.365,319,1.578,320,1.365,321,1.365,322,1.365,323,1.365,324,1.365]],["title/51",[63,0.464,223,2.419,259,1.686]],["description/51",[39,1.164,63,0.433,100,1.265,202,2.578,259,1.572,291,3.268,292,3.396,293,2.786,294,3.396,295,3.396,296,2.578,325,3.926]],["title/52",[40,1.606,62,1.92,63,0.502,223,1.802,259,1.256]],["description/52",[40,1.898,63,0.565,68,2.627,220,2.27,259,2.054,272,2.876,291,3.141,298,3.205,299,2.63,300,2.63,326,3.205]],["title/53",[40,1.935,63,0.416,259,1.513,282,2.481]],["description/53",[9,1.134,11,0.637,39,0.389,40,1.825,63,0.25,67,0.931,68,2.06,90,0.861,100,0.423,106,0.71,154,1.018,180,1.134,182,1.134,196,0.441,200,0.931,203,1.018,205,1.018,206,1.018,208,0.861,216,1.018,220,0.803,223,0.754,250,0.931,259,1.998,282,0.861,291,2.182,293,0.931,296,1.964,299,0.931,300,0.931,302,1.134,303,1.134,304,1.134,305,1.134,306,1.134,307,1.134,308,1.134,309,1.134,310,1.134,311,1.134,312,1.96,313,1.134,314,1.134,315,1.134,316,1.134,317,1.134,318,1.134,320,1.134,321,1.134,322,1.134,323,1.96,324,1.134,326,1.134,327,1.311,328,1.311,329,1.134,330,1.311,331,1.311]],["title/54",[79,2.579,198,2.045,223,2.419]],["description/54",[332,6.108]],["title/55",[13,1.745,130,1.835,333,3.268,334,3.268]],["description/55",[335,6.108]],["title/56",[11,0.602,13,0.572,64,0.324,106,0.671,130,0.602,136,0.813,149,1.072,151,1.072,198,1.048,200,0.879,208,0.813,211,1.239,271,0.879,296,0.813,329,1.072,333,1.072,334,1.072,336,1.239,337,1.239,338,1.239,339,1.239,340,1.239]],["description/56",[341,6.108]],["title/57",[202,2.764,284,3.641,342,4.21]],["description/57",[343,6.108]],["title/58",[108,2.932,198,1.835,239,2.681,344,3.268]],["description/58",[194,2.747,246,3.392,345,4.78,346,4.78,347,4.78,348,4.78,349,4.78]],["title/59",[196,1.27,198,1.835,239,2.681,344,3.268]],["description/59",[64,1.456,94,1.529,194,2.399,196,1.869,202,2.741,246,2.963,350,4.175,351,4.175,352,4.175]],["title/60",[11,1.404,118,0.971,196,0.971,198,1.404,238,1.897,353,2.89,354,2.89]],["description/60",[355,6.108]],["title/61",[196,1.27,198,1.835,223,2.171,238,2.481]],["description/61",[356,6.108]],["title/62",[196,1.415,357,4.21,358,2.988]],["description/62",[64,1.456,94,2.037,101,2.138,130,2.028,171,3.24,196,1.403,285,3.611,358,2.963,359,4.175]],["title/63",[196,1.415,266,2.28,358,2.988]],["description/63",[60,1.946,64,1.23,68,1.285,74,1.647,76,2.992,94,1.72,101,1.285,130,1.218,155,2.169,196,1.771,236,1.946,266,1.358,358,3.332,360,2.508,361,2.508,362,2.508,363,2.508,364,2.508,365,2.508,366,2.508,367,2.508,368,2.508]],["title/64",[130,2.045,369,3.641,370,4.21]],["description/64",[369,5.283]]],"invertedIndex":[["",{"_index":68,"title":{},"description":{"1":{},"2":{},"9":{},"39":{},"49":{},"50":{},"52":{},"53":{},"63":{}}}],["0",{"_index":299,"title":{},"description":{"49":{},"50":{},"52":{},"53":{}}}],["1",{"_index":272,"title":{},"description":{"39":{},"49":{},"52":{}}}],["100",{"_index":107,"title":{},"description":{"2":{}}}],["1024x512",{"_index":310,"title":{},"description":{"50":{},"53":{}}}],["16",{"_index":328,"title":{},"description":{"53":{}}}],["16-bit",{"_index":215,"title":{},"description":{"27":{},"28":{}}}],["1d",{"_index":333,"title":{"55":{},"56":{}},"description":{}}],["32-bit",{"_index":329,"title":{"56":{}},"description":{"53":{}}}],["4-byte",{"_index":319,"title":{},"description":{"50":{}}}],["8",{"_index":323,"title":{},"description":{"50":{},"53":{}}}],["accept",{"_index":114,"title":{},"description":{"3":{}}}],["account",{"_index":303,"title":{},"description":{"50":{},"53":{}}}],["acquisit",{"_index":65,"title":{"1":{},"4":{},"5":{},"39":{},"40":{}},"description":{"3":{},"7":{},"8":{},"37":{}}}],["actual",{"_index":298,"title":{},"description":{"49":{},"52":{}}}],["adjust",{"_index":244,"title":{},"description":{"31":{},"33":{}}}],["affect",{"_index":145,"title":{},"description":{"5":{}}}],["again",{"_index":181,"title":{},"description":{"9":{}}}],["algorithm",{"_index":188,"title":{"11":{}},"description":{}}],["allow",{"_index":50,"title":{},"description":{"0":{},"29":{}}}],["alway",{"_index":176,"title":{},"description":{"8":{}}}],["and/or",{"_index":228,"title":{},"description":{"29":{}}}],["anytim",{"_index":186,"title":{},"description":{"10":{},"12":{},"14":{},"16":{},"18":{},"20":{},"23":{},"24":{},"26":{}}}],["api",{"_index":2,"title":{},"description":{"0":{}}}],["appli",{"_index":9,"title":{},"description":{"0":{},"53":{}}}],["applic",{"_index":17,"title":{},"description":{"0":{}}}],["approach",{"_index":30,"title":{},"description":{"0":{}}}],["array",{"_index":271,"title":{"56":{}},"description":{"39":{},"40":{},"50":{}}}],["asic",{"_index":175,"title":{},"description":{"8":{}}}],["assign",{"_index":317,"title":{},"description":{"50":{},"53":{}}}],["async",{"_index":87,"title":{},"description":{"1":{},"2":{}}}],["async_start",{"_index":119,"title":{},"description":{"3":{}}}],["automat",{"_index":182,"title":{},"description":{"9":{},"53":{}}}],["avail",{"_index":236,"title":{"30":{}},"description":{"35":{},"63":{}}}],["azimuth",{"_index":208,"title":{"25":{},"26":{},"56":{}},"description":{"50":{},"53":{}}}],["back",{"_index":168,"title":{},"description":{"7":{}}}],["base",{"_index":253,"title":{},"description":{"31":{}}}],["be",{"_index":157,"title":{},"description":{"7":{}}}],["beam",{"_index":304,"title":{},"description":{"50":{},"53":{}}}],["befor",{"_index":177,"title":{},"description":{"8":{}}}],["behavior",{"_index":110,"title":{},"description":{"3":{}}}],["between",{"_index":366,"title":{},"description":{"63":{}}}],["binari",{"_index":211,"title":{"27":{},"48":{},"49":{},"50":{},"56":{}},"description":{"27":{},"50":{}}}],["bit",{"_index":322,"title":{},"description":{"50":{},"53":{}}}],["blob",{"_index":214,"title":{},"description":{"27":{}}}],["block",{"_index":111,"title":{},"description":{"3":{},"4":{},"5":{}}}],["bodi",{"_index":122,"title":{},"description":{"3":{}}}],["both",{"_index":309,"title":{},"description":{"50":{},"53":{}}}],["bragg",{"_index":190,"title":{"13":{},"14":{}},"description":{}}],["buffer",{"_index":358,"title":{"62":{},"63":{}},"description":{"62":{},"63":{}}}],["calcul",{"_index":258,"title":{"35":{},"36":{}},"description":{}}],["calibr",{"_index":98,"title":{"47":{}},"description":{"2":{},"9":{}}}],["call",{"_index":60,"title":{},"description":{"0":{},"3":{},"63":{}}}],["cancel",{"_index":146,"title":{"7":{}},"description":{"5":{},"7":{}}}],["card",{"_index":153,"title":{},"description":{"7":{}}}],["case",{"_index":67,"title":{},"description":{"1":{},"3":{},"50":{},"53":{}}}],["cbor",{"_index":344,"title":{"58":{},"59":{}},"description":{}}],["cell",{"_index":82,"title":{},"description":{"1":{},"47":{}}}],["chang",{"_index":117,"title":{"9":{},"11":{},"13":{},"15":{},"17":{},"19":{}},"description":{"3":{},"9":{},"29":{},"31":{},"33":{}}}],["choos",{"_index":24,"title":{},"description":{"0":{},"29":{}}}],["clarif",{"_index":1,"title":{"0":{}},"description":{}}],["clear",{"_index":357,"title":{"62":{}},"description":{}}],["client",{"_index":15,"title":{},"description":{"0":{},"4":{},"5":{}}}],["close",{"_index":73,"title":{},"description":{"1":{},"2":{},"4":{},"5":{}}}],["code",{"_index":19,"title":{"40":{}},"description":{"0":{},"40":{}}}],["collect",{"_index":94,"title":{"2":{},"7":{},"21":{},"22":{},"35":{},"36":{},"46":{}},"description":{"4":{},"5":{},"7":{},"9":{},"23":{},"46":{},"59":{},"62":{},"63":{}}}],["come",{"_index":350,"title":{},"description":{"59":{}}}],["command",{"_index":144,"title":{},"description":{"5":{},"7":{},"8":{},"29":{}}}],["commun",{"_index":57,"title":{},"description":{"0":{}}}],["config/azim_int",{"_index":209,"title":{},"description":{"25":{},"26":{}}}],["config/bragg_integr",{"_index":191,"title":{},"description":{"13":{},"14":{}}}],["config/dark_mask",{"_index":265,"title":{},"description":{"35":{},"36":{}}}],["config/detector",{"_index":185,"title":{},"description":{"9":{},"10":{}}}],["config/file_writ",{"_index":192,"title":{},"description":{"15":{},"16":{}}}],["config/image_format",{"_index":199,"title":{},"description":{"19":{},"20":{}}}],["config/image_format/convers",{"_index":204,"title":{},"description":{"22":{}}}],["config/image_format/raw",{"_index":201,"title":{},"description":{"21":{}}}],["config/index",{"_index":189,"title":{},"description":{"11":{},"12":{}}}],["config/instru",{"_index":195,"title":{},"description":{"17":{},"18":{}}}],["config/internal_generator_imag",{"_index":222,"title":{},"description":{"27":{}}}],["config/internal_generator_image.tiff",{"_index":224,"title":{},"description":{"28":{}}}],["config/mask",{"_index":297,"title":{},"description":{"48":{}}}],["config/mask.tiff",{"_index":325,"title":{},"description":{"51":{}}}],["config/roi",{"_index":281,"title":{},"description":{"43":{},"44":{}}}],["config/select_detector",{"_index":235,"title":{},"description":{"29":{},"30":{}}}],["config/spot_find",{"_index":207,"title":{},"description":{"23":{},"24":{}}}],["config/user_mask",{"_index":301,"title":{},"description":{"49":{},"50":{}}}],["config/user_mask.tiff",{"_index":326,"title":{},"description":{"52":{},"53":{}}}],["config/zeromq_metadata",{"_index":257,"title":{},"description":{"33":{},"34":{}}}],["config/zeromq_preview",{"_index":254,"title":{},"description":{"31":{},"32":{}}}],["configur",{"_index":179,"title":{"9":{},"10":{},"12":{},"14":{},"21":{},"22":{},"23":{},"24":{},"25":{},"26":{},"35":{}},"description":{"30":{}}}],["connect",{"_index":141,"title":{},"description":{"4":{},"5":{}}}],["consist",{"_index":232,"title":{},"description":{"29":{}}}],["contain",{"_index":246,"title":{},"description":{"31":{},"33":{},"58":{},"59":{}}}],["control",{"_index":226,"title":{},"description":{"29":{}}}],["convers",{"_index":203,"title":{"22":{}},"description":{"50":{},"53":{}}}],["convert",{"_index":313,"title":{},"description":{"50":{},"53":{}}}],["coordin",{"_index":220,"title":{},"description":{"27":{},"28":{},"49":{},"50":{},"52":{},"53":{}}}],["copyleft",{"_index":7,"title":{},"description":{"0":{}}}],["cover",{"_index":256,"title":{},"description":{"33":{}}}],["cpu",{"_index":159,"title":{},"description":{"7":{}}}],["current",{"_index":96,"title":{"2":{},"39":{},"40":{}},"description":{"7":{}}}],["custom",{"_index":354,"title":{"60":{}},"description":{}}],["dark",{"_index":95,"title":{"2":{},"35":{},"36":{}},"description":{}}],["data",{"_index":64,"title":{"1":{},"7":{},"21":{},"22":{},"24":{},"35":{},"36":{},"39":{},"40":{},"46":{},"56":{}},"description":{"3":{},"4":{},"5":{},"7":{},"8":{},"23":{},"31":{},"33":{},"37":{},"46":{},"59":{},"62":{},"63":{}}}],["dataset",{"_index":345,"title":{},"description":{"58":{}}}],["deactiv",{"_index":172,"title":{},"description":{"8":{}}}],["dectri",{"_index":260,"title":{},"description":{"35":{}}}],["default",{"_index":109,"title":{},"description":{"3":{}}}],["definit",{"_index":3,"title":{"43":{},"44":{}},"description":{"0":{}}}],["depend",{"_index":221,"title":{},"description":{"27":{},"28":{}}}],["deriv",{"_index":47,"title":{},"description":{"0":{}}}],["detector",{"_index":63,"title":{"1":{},"2":{},"3":{},"6":{},"8":{},"9":{},"10":{},"29":{},"30":{},"42":{},"48":{},"49":{},"50":{},"51":{},"52":{},"53":{}},"description":{"1":{},"2":{},"3":{},"4":{},"7":{},"8":{},"9":{},"11":{},"13":{},"15":{},"17":{},"19":{},"21":{},"22":{},"25":{},"27":{},"28":{},"29":{},"30":{},"35":{},"42":{},"48":{},"49":{},"50":{},"51":{},"52":{},"53":{}}}],["detector/statu",{"_index":279,"title":{},"description":{"42":{}}}],["develop",{"_index":37,"title":{},"description":{"0":{}}}],["devic",{"_index":267,"title":{"38":{}},"description":{}}],["distribut",{"_index":22,"title":{},"description":{"0":{}}}],["doesn't",{"_index":337,"title":{"56":{}},"description":{}}],["don't",{"_index":316,"title":{},"description":{"50":{},"53":{}}}],["done",{"_index":93,"title":{"5":{}},"description":{"1":{},"2":{},"9":{},"10":{},"11":{},"12":{},"13":{},"14":{},"15":{},"16":{},"17":{},"18":{},"19":{},"20":{},"21":{},"22":{},"23":{},"24":{},"25":{},"26":{},"35":{}}}],["dure",{"_index":76,"title":{},"description":{"1":{},"9":{},"63":{}}}],["e.g",{"_index":346,"title":{},"description":{"58":{}}}],["each",{"_index":287,"title":{},"description":{"47":{}}}],["effect",{"_index":169,"title":{},"description":{"7":{},"9":{},"31":{}}}],["eiger",{"_index":263,"title":{},"description":{"35":{}}}],["ensur",{"_index":92,"title":{},"description":{"1":{},"2":{},"3":{},"4":{},"5":{}}}],["error",{"_index":70,"title":{},"description":{"1":{},"8":{},"9":{},"11":{},"13":{},"15":{},"17":{},"19":{},"21":{},"22":{},"35":{}}}],["etc",{"_index":46,"title":{},"description":{"0":{}}}],["event",{"_index":275,"title":{"40":{}},"description":{"40":{}}}],["exampl",{"_index":302,"title":{},"description":{"50":{},"53":{}}}],["except",{"_index":25,"title":{},"description":{"0":{}}}],["execut",{"_index":83,"title":{},"description":{"1":{},"4":{},"5":{},"9":{}}}],["expect",{"_index":318,"title":{},"description":{"50":{},"53":{}}}],["experiment",{"_index":347,"title":{},"description":{"58":{}}}],["explicitli",{"_index":38,"title":{},"description":{"0":{}}}],["extend",{"_index":138,"title":{},"description":{"4":{},"5":{}}}],["extern",{"_index":127,"title":{},"description":{"4":{},"5":{}}}],["few",{"_index":85,"title":{},"description":{"1":{}}}],["file",{"_index":10,"title":{"15":{},"16":{}},"description":{"0":{}}}],["find",{"_index":206,"title":{"23":{}},"description":{"50":{},"53":{}}}],["finish",{"_index":143,"title":{},"description":{"5":{},"7":{}}}],["float",{"_index":336,"title":{"56":{}},"description":{}}],["format",{"_index":198,"title":{"19":{},"20":{},"21":{},"22":{},"54":{},"56":{},"58":{},"59":{},"60":{},"61":{}},"description":{}}],["fpga",{"_index":152,"title":{"27":{},"28":{},"38":{}},"description":{"7":{},"27":{},"28":{}}}],["fpga_statu",{"_index":268,"title":{},"description":{"38":{}}}],["frame",{"_index":156,"title":{},"description":{"7":{}}}],["full",{"_index":202,"title":{"22":{},"57":{}},"description":{"48":{},"51":{},"59":{}}}],["function",{"_index":88,"title":{},"description":{"1":{},"2":{}}}],["gap",{"_index":315,"title":{},"description":{"50":{},"53":{}}}],["gcc",{"_index":33,"title":{},"description":{"0":{}}}],["gener",{"_index":13,"title":{"27":{},"28":{},"45":{},"55":{},"56":{}},"description":{"0":{},"6":{},"27":{},"28":{},"31":{},"33":{}}}],["geometri",{"_index":348,"title":{},"description":{"58":{}}}],["given",{"_index":162,"title":{},"description":{"7":{}}}],["goe",{"_index":362,"title":{},"description":{"63":{}}}],["good",{"_index":300,"title":{},"description":{"49":{},"50":{},"52":{},"53":{}}}],["gpl",{"_index":6,"title":{},"description":{"0":{}}}],["gpl-3.0",{"_index":5,"title":{},"description":{"0":{}}}],["gracefulli",{"_index":165,"title":{},"description":{"7":{}}}],["happen",{"_index":213,"title":{},"description":{"27":{},"28":{}}}],["header",{"_index":32,"title":{},"description":{"0":{}}}],["here",{"_index":243,"title":{},"description":{"31":{},"33":{}}}],["high",{"_index":173,"title":{},"description":{"8":{}}}],["hour",{"_index":104,"title":{},"description":{"2":{}}}],["http",{"_index":249,"title":{},"description":{"31":{},"33":{}}}],["i.",{"_index":180,"title":{},"description":{"9":{},"53":{}}}],["id",{"_index":231,"title":{"39":{}},"description":{"29":{},"39":{}}}],["idl",{"_index":100,"title":{},"description":{"2":{},"3":{},"7":{},"8":{},"9":{},"11":{},"13":{},"15":{},"17":{},"19":{},"21":{},"22":{},"25":{},"27":{},"28":{},"35":{},"50":{},"51":{},"53":{}}}],["ignor",{"_index":250,"title":{},"description":{"31":{},"33":{},"50":{},"53":{}}}],["imag",{"_index":196,"title":{"19":{},"20":{},"27":{},"28":{},"41":{},"59":{},"60":{},"61":{},"62":{},"63":{}},"description":{"27":{},"28":{},"33":{},"39":{},"53":{},"59":{},"62":{},"63":{}}}],["image.cbor",{"_index":367,"title":{},"description":{"63":{}}}],["image_buffer/clear",{"_index":359,"title":{},"description":{"62":{}}}],["image_buffer/image.cbor",{"_index":352,"title":{},"description":{"59":{}}}],["image_buffer/image.jpeg",{"_index":355,"title":{},"description":{"60":{}}}],["image_buffer/image.tiff",{"_index":356,"title":{},"description":{"61":{}}}],["image_buffer/start.cbor",{"_index":349,"title":{},"description":{"58":{}}}],["image_buffer/statu",{"_index":368,"title":{},"description":{"63":{}}}],["image_pusher/statu",{"_index":278,"title":{},"description":{"41":{}}}],["immedi",{"_index":124,"title":{},"description":{"3":{}}}],["implement",{"_index":16,"title":{},"description":{"0":{}}}],["impos",{"_index":54,"title":{},"description":{"0":{}}}],["inact",{"_index":69,"title":{},"description":{"1":{},"9":{},"11":{},"13":{},"15":{},"17":{},"19":{},"21":{},"22":{},"25":{},"29":{},"35":{}}}],["includ",{"_index":360,"title":{},"description":{"63":{}}}],["indefinit",{"_index":133,"title":{},"description":{"4":{},"5":{}}}],["index",{"_index":187,"title":{"11":{},"12":{}},"description":{}}],["inform",{"_index":151,"title":{"56":{}},"description":{"7":{}}}],["initi",{"_index":62,"title":{"1":{},"49":{},"52":{}},"description":{"1":{},"5":{},"48":{}}}],["instead",{"_index":80,"title":{},"description":{"1":{}}}],["instrument",{"_index":193,"title":{"17":{},"18":{}},"description":{}}],["integ",{"_index":216,"title":{},"description":{"27":{},"28":{},"53":{}}}],["integr",{"_index":106,"title":{"13":{},"14":{},"25":{},"26":{},"56":{}},"description":{"2":{},"50":{},"53":{}}}],["intend",{"_index":49,"title":{},"description":{"0":{}}}],["interact",{"_index":18,"title":{},"description":{"0":{}}}],["interfac",{"_index":43,"title":{},"description":{"0":{},"1":{}}}],["intern",{"_index":212,"title":{"27":{},"28":{}},"description":{"27":{},"28":{}}}],["ioctl",{"_index":45,"title":{},"description":{"0":{}}}],["jfjoch_brok",{"_index":370,"title":{"64":{}},"description":{}}],["jpeg",{"_index":353,"title":{"60":{}},"description":{}}],["jungfrau",{"_index":99,"title":{},"description":{"2":{},"42":{}}}],["jungfraujoch",{"_index":130,"title":{"37":{},"55":{},"56":{},"64":{}},"description":{"4":{},"29":{},"31":{},"33":{},"62":{},"63":{}}}],["kernel",{"_index":36,"title":{},"description":{"0":{}}}],["kernel'",{"_index":29,"title":{},"description":{"0":{}}}],["last",{"_index":285,"title":{},"description":{"46":{},"62":{}}}],["latest",{"_index":351,"title":{},"description":{"59":{}}}],["latter",{"_index":314,"title":{},"description":{"50":{},"53":{}}}],["librari",{"_index":35,"title":{},"description":{"0":{}}}],["licens",{"_index":0,"title":{"0":{}},"description":{"0":{}}}],["limit",{"_index":340,"title":{"56":{}},"description":{}}],["linux",{"_index":28,"title":{},"description":{"0":{}}}],["list",{"_index":230,"title":{"30":{}},"description":{"29":{}}}],["load",{"_index":210,"title":{"27":{},"28":{}},"description":{"27":{},"28":{}}}],["long",{"_index":105,"title":{},"description":{"2":{}}}],["make",{"_index":163,"title":{},"description":{"7":{}}}],["mask",{"_index":259,"title":{"35":{},"36":{},"48":{},"49":{},"50":{},"51":{},"52":{},"53":{}},"description":{"48":{},"49":{},"50":{},"51":{},"52":{},"53":{}}}],["mean",{"_index":295,"title":{},"description":{"48":{},"51":{}}}],["mechan",{"_index":61,"title":{},"description":{"0":{}}}],["mere",{"_index":42,"title":{},"description":{"0":{}}}],["messag",{"_index":239,"title":{"58":{},"59":{}},"description":{"31":{},"33":{}}}],["metadata",{"_index":194,"title":{"17":{},"18":{},"33":{},"34":{}},"description":{"33":{},"58":{},"59":{}}}],["minut",{"_index":86,"title":{},"description":{"1":{}}}],["misbehav",{"_index":306,"title":{},"description":{"50":{},"53":{}}}],["mode",{"_index":308,"title":{},"description":{"50":{},"53":{}}}],["modul",{"_index":312,"title":{},"description":{"50":{},"53":{}}}],["module/storag",{"_index":288,"title":{},"description":{"47":{}}}],["moment",{"_index":261,"title":{},"description":{"35":{}}}],["more",{"_index":363,"title":{},"description":{"63":{}}}],["multipl",{"_index":227,"title":{},"description":{"29":{}}}],["need",{"_index":90,"title":{},"description":{"1":{},"2":{},"3":{},"50":{},"53":{}}}],["network",{"_index":59,"title":{},"description":{"0":{},"1":{},"7":{}}}],["new",{"_index":183,"title":{},"description":{"9":{}}}],["number",{"_index":217,"title":{},"description":{"27":{},"28":{}}}],["nxmx",{"_index":293,"title":{},"description":{"48":{},"50":{},"51":{},"53":{}}}],["on",{"_index":89,"title":{},"description":{"1":{},"2":{},"3":{},"9":{},"29":{}}}],["onc",{"_index":102,"title":{},"description":{"2":{}}}],["openapi",{"_index":14,"title":{},"description":{"0":{}}}],["oper",{"_index":74,"title":{},"description":{"1":{},"2":{},"9":{},"35":{},"63":{}}}],["option",{"_index":252,"title":{},"description":{"31":{}}}],["output",{"_index":197,"title":{"19":{},"20":{}},"description":{}}],["pedest",{"_index":79,"title":{"54":{}},"description":{"1":{},"2":{},"5":{},"7":{},"9":{}}}],["per",{"_index":103,"title":{},"description":{"2":{}}}],["period",{"_index":134,"title":{},"description":{"4":{},"5":{}}}],["pixel",{"_index":291,"title":{},"description":{"48":{},"49":{},"50":{},"51":{},"52":{},"53":{}}}],["plot",{"_index":334,"title":{"55":{},"56":{}},"description":{}}],["point",{"_index":264,"title":{},"description":{"35":{}}}],["possibl",{"_index":139,"title":{},"description":{"4":{},"5":{},"35":{}}}],["post",{"_index":78,"title":{},"description":{"1":{},"2":{}}}],["power",{"_index":178,"title":{},"description":{"8":{}}}],["prepar",{"_index":170,"title":{"8":{}},"description":{}}],["preview",{"_index":238,"title":{"31":{},"32":{},"60":{},"61":{}},"description":{"31":{}}}],["preview/pedestal.tiff",{"_index":332,"title":{},"description":{"54":{}}}],["preview/plot",{"_index":335,"title":{},"description":{"55":{}}}],["preview/plot.bin",{"_index":341,"title":{},"description":{"56":{}}}],["procedur",{"_index":135,"title":{},"description":{"4":{},"5":{},"9":{}}}],["process",{"_index":158,"title":{"24":{}},"description":{"7":{}}}],["program",{"_index":41,"title":{},"description":{"0":{}}}],["provid",{"_index":136,"title":{"56":{}},"description":{"4":{},"5":{},"29":{},"47":{}}}],["provis",{"_index":8,"title":{},"description":{"0":{}}}],["psi",{"_index":262,"title":{},"description":{"35":{}}}],["pub",{"_index":255,"title":{},"description":{"33":{}}}],["puls",{"_index":270,"title":{"39":{}},"description":{"39":{}}}],["pusher",{"_index":277,"title":{"41":{}},"description":{}}],["put",{"_index":251,"title":{},"description":{"31":{},"33":{}}}],["raw",{"_index":200,"title":{"21":{},"56":{}},"description":{"50":{},"53":{}}}],["raw/convert",{"_index":219,"title":{},"description":{"27":{},"28":{}}}],["readi",{"_index":113,"title":{},"description":{"3":{},"4":{}}}],["recommend",{"_index":77,"title":{},"description":{"1":{},"2":{}}}],["reconfigur",{"_index":75,"title":{},"description":{"1":{}}}],["record",{"_index":273,"title":{},"description":{"39":{}}}],["regardless",{"_index":55,"title":{},"description":{"0":{}}}],["region",{"_index":307,"title":{},"description":{"50":{},"53":{}}}],["region-of-interest",{"_index":229,"title":{},"description":{"29":{}}}],["reiniti",{"_index":234,"title":{},"description":{"29":{}}}],["replac",{"_index":365,"title":{},"description":{"63":{}}}],["request",{"_index":121,"title":{},"description":{"3":{},"31":{},"33":{}}}],["requir",{"_index":21,"title":{},"description":{"0":{},"4":{},"5":{},"27":{},"28":{},"29":{}}}],["respons",{"_index":233,"title":{},"description":{"29":{}}}],["result",{"_index":284,"title":{"57":{}},"description":{"46":{}}}],["result/scan",{"_index":343,"title":{},"description":{"57":{}}}],["retri",{"_index":142,"title":{},"description":{"4":{},"5":{}}}],["return",{"_index":123,"title":{"39":{},"40":{}},"description":{"3":{},"39":{},"40":{}}}],["roi",{"_index":280,"title":{"43":{},"44":{}},"description":{}}],["run",{"_index":101,"title":{"4":{},"7":{}},"description":{"2":{},"3":{},"5":{},"7":{},"23":{},"62":{},"63":{}}}],["runtim",{"_index":34,"title":{},"description":{"0":{}}}],["safeti",{"_index":140,"title":{},"description":{"4":{},"5":{}}}],["save",{"_index":184,"title":{},"description":{"9":{}}}],["scan",{"_index":342,"title":{"57":{}},"description":{}}],["script",{"_index":128,"title":{},"description":{"4":{},"5":{}}}],["see",{"_index":292,"title":{},"description":{"48":{},"51":{}}}],["select",{"_index":225,"title":{"29":{}},"description":{"30":{}}}],["send",{"_index":149,"title":{"6":{},"56":{}},"description":{}}],["sent",{"_index":160,"title":{},"description":{"7":{}}}],["separ",{"_index":289,"title":{},"description":{"47":{}}}],["server",{"_index":132,"title":{},"description":{"4":{},"5":{}}}],["set",{"_index":118,"title":{"11":{},"13":{},"15":{},"16":{},"31":{},"32":{},"33":{},"34":{},"35":{},"36":{},"60":{}},"description":{"3":{},"9":{},"27":{},"28":{},"29":{},"31":{},"33":{}}}],["shadow",{"_index":305,"title":{},"description":{"50":{},"53":{}}}],["shutter",{"_index":72,"title":{},"description":{"1":{},"2":{}}}],["sign",{"_index":330,"title":{},"description":{"53":{}}}],["similar",{"_index":26,"title":{},"description":{"0":{}}}],["single-channel",{"_index":327,"title":{},"description":{"53":{}}}],["size",{"_index":218,"title":{},"description":{"27":{},"28":{}}}],["slot",{"_index":364,"title":{},"description":{"63":{}}}],["socket",{"_index":242,"title":{"34":{}},"description":{"31":{},"33":{}}}],["socket_address",{"_index":247,"title":{},"description":{"31":{},"33":{}}}],["soft",{"_index":150,"title":{"6":{}},"description":{"6":{}}}],["soft/ttl",{"_index":115,"title":{},"description":{"3":{}}}],["softwar",{"_index":148,"title":{},"description":{"5":{}}}],["sole",{"_index":12,"title":{},"description":{"0":{}}}],["specif",{"_index":52,"title":{},"description":{"0":{}}}],["spirit",{"_index":27,"title":{},"description":{"0":{}}}],["spot",{"_index":205,"title":{"23":{}},"description":{"50":{},"53":{}}}],["stack",{"_index":311,"title":{},"description":{"50":{},"53":{}}}],["stage",{"_index":155,"title":{},"description":{"7":{},"63":{}}}],["standard",{"_index":294,"title":{},"description":{"48":{},"51":{}}}],["start",{"_index":108,"title":{"3":{},"58":{}},"description":{"3":{}}}],["state",{"_index":39,"title":{},"description":{"0":{},"1":{},"2":{},"3":{},"7":{},"8":{},"9":{},"11":{},"13":{},"15":{},"17":{},"19":{},"21":{},"22":{},"27":{},"28":{},"29":{},"35":{},"50":{},"51":{},"53":{}}}],["statist",{"_index":283,"title":{"45":{},"46":{},"47":{}},"description":{"45":{},"47":{}}}],["statistics/calibr",{"_index":290,"title":{},"description":{"47":{}}}],["statistics/data_collect",{"_index":286,"title":{},"description":{"46":{}}}],["statu",{"_index":266,"title":{"37":{},"38":{},"41":{},"42":{},"63":{}},"description":{"37":{},"42":{},"63":{}}}],["stop",{"_index":154,"title":{},"description":{"7":{},"50":{},"53":{}}}],["storag",{"_index":81,"title":{},"description":{"1":{}}}],["store",{"_index":321,"title":{},"description":{"50":{},"53":{}}}],["stream",{"_index":240,"title":{},"description":{"31":{},"33":{}}}],["structur",{"_index":245,"title":{},"description":{"31":{},"33":{}}}],["sub",{"_index":241,"title":{},"description":{"31":{}}}],["subject",{"_index":20,"title":{},"description":{"0":{}}}],["sure",{"_index":164,"title":{},"description":{"7":{}}}],["switch",{"_index":167,"title":{},"description":{"7":{}}}],["synchron",{"_index":147,"title":{},"description":{"5":{}}}],["syscal",{"_index":44,"title":{},"description":{"0":{}}}],["take",{"_index":166,"title":{},"description":{"7":{}}}],["term",{"_index":23,"title":{},"description":{"0":{}}}],["through",{"_index":58,"title":{},"description":{"0":{}}}],["tiff",{"_index":223,"title":{"28":{},"51":{},"52":{},"54":{},"61":{}},"description":{"28":{},"53":{}}}],["till",{"_index":129,"title":{},"description":{"4":{},"5":{}}}],["time",{"_index":84,"title":{},"description":{"1":{},"2":{},"4":{},"5":{},"7":{}}}],["timeout",{"_index":137,"title":{},"description":{"4":{},"5":{}}}],["transmit",{"_index":338,"title":{"56":{}},"description":{}}],["trigger",{"_index":116,"title":{"6":{}},"description":{"3":{},"6":{}}}],["true",{"_index":120,"title":{},"description":{"3":{}}}],["turn",{"_index":171,"title":{"8":{}},"description":{"8":{},"62":{}}}],["two",{"_index":66,"title":{},"description":{"1":{}}}],["under",{"_index":4,"title":{},"description":{"0":{}}}],["unsign",{"_index":320,"title":{},"description":{"50":{},"53":{}}}],["until",{"_index":112,"title":{},"description":{"3":{}}}],["updat",{"_index":97,"title":{},"description":{"2":{}}}],["upload",{"_index":282,"title":{"44":{},"50":{},"53":{}},"description":{"50":{},"53":{}}}],["us",{"_index":11,"title":{"56":{},"60":{}},"description":{"0":{},"1":{},"2":{},"3":{},"8":{},"30":{},"50":{},"53":{}}}],["user",{"_index":40,"title":{"49":{},"50":{},"52":{},"53":{}},"description":{"0":{},"49":{},"50":{},"52":{},"53":{}}}],["userspac",{"_index":31,"title":{},"description":{"0":{}}}],["valid",{"_index":331,"title":{},"description":{"53":{}}}],["valu",{"_index":296,"title":{"56":{}},"description":{"48":{},"50":{},"51":{},"53":{}}}],["version",{"_index":369,"title":{"64":{}},"description":{"64":{}}}],["via",{"_index":248,"title":{},"description":{"31":{},"33":{}}}],["volatil",{"_index":361,"title":{},"description":{"63":{}}}],["voltag",{"_index":174,"title":{},"description":{"8":{}}}],["wait",{"_index":126,"title":{"4":{},"5":{}},"description":{}}],["wait_till_don",{"_index":91,"title":{},"description":{"1":{},"2":{},"5":{}}}],["wait_until_run",{"_index":125,"title":{},"description":{"3":{},"4":{}}}],["web",{"_index":131,"title":{},"description":{"4":{},"5":{}}}],["well",{"_index":324,"title":{},"description":{"50":{},"53":{}}}],["whether",{"_index":56,"title":{},"description":{"0":{}}}],["wider",{"_index":51,"title":{},"description":{"0":{}}}],["without",{"_index":53,"title":{},"description":{"0":{}}}],["work",{"_index":48,"title":{},"description":{"0":{}}}],["writer",{"_index":161,"title":{"15":{},"16":{}},"description":{"7":{}}}],["x-axi",{"_index":339,"title":{"56":{}},"description":{}}],["x-ray",{"_index":71,"title":{},"description":{"1":{},"2":{},"9":{}}}],["xfel",{"_index":269,"title":{"39":{},"40":{}},"description":{"39":{},"40":{}}}],["xfel/event_cod",{"_index":276,"title":{},"description":{"40":{}}}],["xfel/pulse_id",{"_index":274,"title":{},"description":{"39":{}}}],["zeromq",{"_index":237,"title":{"31":{},"32":{},"33":{},"34":{}},"description":{"31":{},"33":{}}}]],"pipeline":[]}},"options":{}};
 
       var container = document.getElementById('redoc');
       Redoc.hydrate(__redoc_state, container);
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 59aaf46c3..8a4b2ca8d 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -3,18 +3,11 @@
 
 FIND_PACKAGE(Git)
 
-EXECUTE_PROCESS(COMMAND
-        "${GIT_EXECUTABLE}" describe --match=NeVeRmAtCh --always --abbrev=8
-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-        OUTPUT_VARIABLE GIT_SHA1
-        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-# the date of the commit
-EXECUTE_PROCESS(COMMAND
-        "${GIT_EXECUTABLE}" log -1 --format=%ad --date=local
-        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-        OUTPUT_VARIABLE GIT_DATE
-        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+SET(GITINFO_SOURCE_DIR "${CMAKE_SOURCE_DIR}")
+SET(GITINFO_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/GitInfo.cpp.in")
+SET(GITINFO_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/GitInfo.cpp")
+SET(JFJOCH_BUILD_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/GitInfoStamp.cmake")
 
 set (THREADS_PREFER_PTHREAD_FLAG ON)
 find_package (Threads REQUIRED)
@@ -23,10 +16,24 @@ MESSAGE(STATUS "Jungfraujoch git SHA1: ${GIT_SHA1}")
 MESSAGE(STATUS "Jungfraujoch git date: ${GIT_DATE}")
 MESSAGE(STATUS "Jungfraujoch version: ${JFJOCH_VERSION}")
 
-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/GitInfo.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}/GitInfo.cpp" @ONLY)
+# Re-stamped on every build, so RUGNUX_GIT in the rugnux report (and every other consumer of
+# jfjoch_git_sha1) names the commit that was actually compiled.
+ADD_CUSTOM_TARGET(JFJochGitInfo
+        COMMAND "${CMAKE_COMMAND}"
+            "-DGIT_EXECUTABLE=${GIT_EXECUTABLE}"
+            "-DGITINFO_SOURCE_DIR=${CMAKE_SOURCE_DIR}"
+            "-DGITINFO_TEMPLATE=${CMAKE_CURRENT_SOURCE_DIR}/GitInfo.cpp.in"
+            "-DGITINFO_OUTPUT=${CMAKE_CURRENT_BINARY_DIR}/GitInfo.cpp"
+            "-DJFJOCH_VERSION=${JFJOCH_VERSION}"
+            "-DJFJOCH_BUILD_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
+            -P "${CMAKE_CURRENT_SOURCE_DIR}/GitInfoStamp.cmake"
+        BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/GitInfo.cpp"
+        COMMENT "Stamping GitInfo.cpp from git HEAD"
+        VERBATIM)
 
 ADD_LIBRARY(JFJochVersion STATIC
         ${CMAKE_CURRENT_BINARY_DIR}/GitInfo.cpp GitInfo.h)
+ADD_DEPENDENCIES(JFJochVersion JFJochGitInfo)
 set_target_properties(JFJochVersion PROPERTIES
         POSITION_INDEPENDENT_CODE ON
 )
diff --git a/common/GitInfo.cpp.in b/common/GitInfo.cpp.in
index 98caf90e0..33868dd05 100644
--- a/common/GitInfo.cpp.in
+++ b/common/GitInfo.cpp.in
@@ -13,4 +13,8 @@ std::string jfjoch_git_date() {
 
 std::string jfjoch_version() {
     return "@JFJOCH_VERSION@";
-}
\ No newline at end of file
+}
+
+std::string jfjoch_build_cxx_flags() {
+    return "@JFJOCH_BUILD_CXX_FLAGS@";
+}
diff --git a/common/GitInfo.h b/common/GitInfo.h
index b61e79ec1..4951ef17a 100644
--- a/common/GitInfo.h
+++ b/common/GitInfo.h
@@ -8,3 +8,6 @@
 std::string jfjoch_git_sha1();
 std::string jfjoch_git_date();
 std::string jfjoch_version();
+// CMAKE_CXX_FLAGS of the build - empty on a plain configure. Recorded because two builds of one
+// commit can differ by flags alone, and -march moves the CPU-bound results.
+std::string jfjoch_build_cxx_flags();
diff --git a/common/GitInfoStamp.cmake b/common/GitInfoStamp.cmake
new file mode 100644
index 000000000..f2c9ce138
--- /dev/null
+++ b/common/GitInfoStamp.cmake
@@ -0,0 +1,20 @@
+# Stamps GitInfo.cpp with the SHA of HEAD as it is NOW. Run with `cmake -P` on every build (see the
+# JFJochGitInfo target in CMakeLists.txt here), so the hash a binary reports is the commit it was
+# built from, not the one the tree held when it was last configured - a configure-time stamp once
+# reported a hash seventeen commits stale. configure_file leaves the output untouched when nothing
+# changed, so this costs a recompile only when HEAD moves. Also included at configure time, so the
+# file exists for the generator and the SHA prints with the configure output.
+if (GIT_EXECUTABLE)
+    # --dirty: a build from uncommitted changes says so in the hash itself
+    EXECUTE_PROCESS(COMMAND
+            "${GIT_EXECUTABLE}" describe --match=NeVeRmAtCh --always --abbrev=8 --dirty
+            WORKING_DIRECTORY "${GITINFO_SOURCE_DIR}"
+            OUTPUT_VARIABLE GIT_SHA1
+            ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    EXECUTE_PROCESS(COMMAND
+            "${GIT_EXECUTABLE}" log -1 --format=%ad --date=local
+            WORKING_DIRECTORY "${GITINFO_SOURCE_DIR}"
+            OUTPUT_VARIABLE GIT_DATE
+            ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif ()
+CONFIGURE_FILE("${GITINFO_TEMPLATE}" "${GITINFO_OUTPUT}" @ONLY)
diff --git a/common/IndexingSettings.cpp b/common/IndexingSettings.cpp
index 0976338e1..6b3c994c8 100644
--- a/common/IndexingSettings.cpp
+++ b/common/IndexingSettings.cpp
@@ -19,7 +19,12 @@ IndexingSettings::IndexingSettings() {
 }
 
 IndexingSettings &IndexingSettings::ViableCellMinSpots(int64_t input) {
-    check_min("ViableCellMinSpots", input, 6);
+    // Four, not the default six: six is the stills frame gate's number, and a rotation run is no longer
+    // accepted or refused on it (the pooled spot test in the first pass decides that), so it has no
+    // business being a hard minimum. Four is where the number stops being a convention and becomes a
+    // fact - three spots fit any lattice at all (see MIN_SPOT_COUNT), and the cell and orientation
+    // refinements this same setting bounds need more observations than parameters.
+    check_min("ViableCellMinSpots", input, 4);
     viable_cell_min_spots = input;
     return *this;
 }
diff --git a/common/JFJochMessages.h b/common/JFJochMessages.h
index c4dba77a5..d6b970040 100644
--- a/common/JFJochMessages.h
+++ b/common/JFJochMessages.h
@@ -468,6 +468,14 @@ struct EndMessage {
     // not the same as every image being clean. Offline (rugnux) only; the broker does not merge.
     std::vector<uint8_t> sweep_quality;
     std::vector<std::string> sweep_quality_reasons;
+
+    // Per-image disposition: what became of the image's observations in the merged data, as an index
+    // into frame_disposition_codes (FrameDisposition in image_analysis/scale_merge/Merge.h - merged,
+    // downgraded, rejected). Written to /entry/MX/frameDisposition with the vocabulary alongside it in
+    // /entry/MX/frameDispositionCodes. The sweep-quality code above says what was SEEN over a stretch;
+    // this says what was DONE about it. Offline (rugnux) only; the broker does not merge.
+    std::vector<uint8_t> frame_disposition;
+    std::vector<std::string> frame_disposition_codes;
 };
 
 struct MetadataMessage {
diff --git a/common/Reflection.h b/common/Reflection.h
index 7f547f5fa..5e4f86321 100644
--- a/common/Reflection.h
+++ b/common/Reflection.h
@@ -35,12 +35,14 @@ struct Reflection {
     // sensor is opaque or its material and thickness are unknown. It is carried BESIDE
     // prescaling_corr rather than inside it, because LP and detector response are two different
     // things and every file the field reads keeps them apart. It is one of the three factors whose
-    // product is the total deterministic correction - see flight_corr below, which arrived after
-    // this comment was written and made "the two" wrong. Defaulted to 1 so a reflection read from a
-    // file written before this existed is a no-op rather than a zero.
+    // product is the total deterministic correction, with prescaling_corr above and flight_corr
+    // below. Defaulted to 1 so a reflection read from a file written before this existed is a no-op
+    // rather than a zero.
     float qe_corr = 1.0f;
-    // The air in the sample-to-pixel flight path, exp(D/L * (1/cos(alpha) - 1)): always >= 1, and
-    // exactly 1 when the air correction is switched off. Carried beside the two above for the same
+    // The medium in the sample-to-pixel flight path, exp(D/L * (1/cos(alpha) - 1)) with D the
+    // normal-incidence distance, L the medium's attenuation length and alpha the angle of incidence
+    // on the detector: always >= 1, because an oblique reflection crossed more of the medium than
+    // one arriving head-on. Exactly 1 under --flight-path vacuum. Carried beside the two above for the same
     // reason they are carried apart - it is neither beam geometry nor detector response but the
     // medium in between, and unlike either of them it is set by the flight distance. The total
     // deterministic correction on a reflection is prescaling_corr * qe_corr * flight_corr, and every
@@ -63,6 +65,10 @@ struct MergedReflection {
     float I_half[2] = {NAN, NAN};
     float sigma_half[2] = {NAN, NAN};
     float d = 0.0;
+    // Any observation of this reflection sat on an ice ring. The intensity is still merged and
+    // written - the ring contaminates it, it does not make it absent - and this only marks it so
+    // a consumer that must not read the ring as crystal signal can leave it out.
+    bool on_ice_ring = false;
     bool rfree_flag = false;
     float F = NAN;       // French-Wilson amplitude |F| (filled by ApplyFrenchWilson at end of merge)
     float sigmaF = NAN;  // its sigma
diff --git a/common/ThreadSafeFIFO.h b/common/ThreadSafeFIFO.h
index c1cbba8e2..208923f1a 100644
--- a/common/ThreadSafeFIFO.h
+++ b/common/ThreadSafeFIFO.h
@@ -16,14 +16,29 @@ class ThreadSafeFIFO {
     const size_t max_size;
     size_t max_utilization;
     size_t utilization;
+    bool stopped = false;
 public:
     explicit ThreadSafeFIFO(size_t in_max_size = UINT32_MAX) : max_size(in_max_size), max_utilization(0), utilization(0) {}
 
+    // Release every waiter and make all further blocking operations return at once: puts are
+    // dropped, gets answer with a default-constructed element. Used when the owner of the queue is
+    // torn down - at that point nobody is going to drain it any more, so a producer blocked on a
+    // full queue would never return and the thread join in the destructor would deadlock.
+    void Stop() {
+        std::unique_lock ul(m);
+        stopped = true;
+        c_empty.notify_all();
+        c_full.notify_all();
+    }
+
     void Clear() {
         std::unique_lock ul(m);
         queue = {};
         utilization = 0;
         max_utilization = 0;
+        // A producer blocked on the full queue has to be told the room it was waiting for is there;
+        // nothing else would wake it, as the next Get finds the queue empty and notifies no one.
+        c_full.notify_all();
     }
 
     bool Put(T val) {
@@ -41,7 +56,9 @@ public:
 
     void PutBlocking(T val) {
         std::unique_lock ul(m);
-        c_full.wait(ul, [&]{return queue.size() < max_size;});
+        c_full.wait(ul, [&]{return stopped || (queue.size() < max_size);});
+        if (stopped)
+            return;
         queue.push(val);
         utilization++;
         if (utilization > max_utilization)
@@ -51,7 +68,9 @@ public:
 
     bool PutTimeout(T val, std::chrono::milliseconds timeout) {
         std::unique_lock ul(m);
-        if (!c_full.wait_for(ul, timeout, [&]{ return queue.size() < max_size; }))
+        if (!c_full.wait_for(ul, timeout, [&]{ return stopped || (queue.size() < max_size); }))
+            return false;
+        if (stopped)
             return false;
         queue.push(val);
         utilization++;
@@ -77,7 +96,9 @@ public:
 
     T GetBlocking() {
         std::unique_lock ul(m);
-        c_empty.wait(ul, [&]{return !queue.empty();});
+        c_empty.wait(ul, [&]{return stopped || !queue.empty();});
+        if (queue.empty())
+            return T{};
         T tmp = queue.front();
         queue.pop();
         c_full.notify_one();
@@ -88,7 +109,7 @@ public:
     int GetTimeout(T &val, std::chrono::microseconds timeout) {
         std::unique_lock ul(m);
         if (queue.empty())
-            c_empty.wait_for(ul, timeout, [&]{return !queue.empty();});
+            c_empty.wait_for(ul, timeout, [&]{return stopped || !queue.empty();});
 
         if (queue.empty())
             return 0;
diff --git a/compression/CMakeLists.txt b/compression/CMakeLists.txt
index 935ee6df9..07c04a32d 100644
--- a/compression/CMakeLists.txt
+++ b/compression/CMakeLists.txt
@@ -19,4 +19,4 @@ ADD_LIBRARY(Compression STATIC
 set_target_properties(Compression PROPERTIES POSITION_INDEPENDENT_CODE ON)
 TARGET_COMPILE_DEFINITIONS(Compression PUBLIC -DZSTD_SUPPORT -DUSE_ZSTD)
 TARGET_LINK_LIBRARIES(Compression libzstd_static)
-TARGET_INCLUDE_DIRECTORIES(Compression PUBLIC . zstd/lib)
+TARGET_INCLUDE_DIRECTORIES(Compression PUBLIC .)
diff --git a/docker/build_images.sh b/docker/build_images.sh
index b4983d5b2..d823bb75e 100755
--- a/docker/build_images.sh
+++ b/docker/build_images.sh
@@ -3,8 +3,11 @@
 #
 # Each docker/<variant>/Dockerfile is a *self-contained build environment* (toolchain, static Qt,
 # static libdbus, static OpenSSL, Eigen, DIALS, XDS, Node, ...). It does NOT copy the project in --
-# the source is mounted and built at run time (see build_in_rocky9.sh). So the build context is just
-# the per-variant directory; the huge repo is never sent to the Docker daemon.
+# the source is mounted and built at run time (see build_in_rocky9.sh).
+#
+# The build context is docker/ rather than docker/<variant>/, because every variant COPYs the
+# shared steps in docker/common/ (see common/README.md). That context is still only the Dockerfiles
+# and those scripts; the huge repo is never sent to the Docker daemon.
 #
 # Images are tagged  gitea.psi.ch/leonarski_f/jfjoch_<variant>:<TAG>  (matches the CI runner images).
 #
@@ -20,12 +23,15 @@
 #   docker/build_images.sh rocky9 rocky8       # subset
 #   JOBS=4 docker/build_images.sh              # all four at once
 #   JOBS=1 docker/build_images.sh              # serial
-#   TAG=2607b docker/build_images.sh           # override the tag (default 2607b)
+#   TAG=2610 docker/build_images.sh           # override the tag (default 2609)
 #
 # The tag has to match what .gitea/workflows/build_and_test.yml asks the runner for, or CI pulls a
-# different image than the one just built. Currently jfjoch_rocky8:2511 and jfjoch_ubuntu2404:2508 --
-# ubuntu2404 being the image that also carries the aarch64 cross toolchain, so:
-#   TAG=2508 docker/build_images.sh ubuntu2404
+# different image than the one just built. Every job there names its image explicitly, and all four
+# are on the same tag (2609). Build a single variant with, e.g.:
+#   TAG=2609 docker/build_images.sh ubuntu2404
+#
+# JOBS: static Qt needs ~15-20 GB of scratch per concurrent build on top of a 10-20 GB result, so
+# four at once will exhaust a 200 GB disk. JOBS=1 is the safe choice on a box that also runs CI.
 #   PUSH=1   docker/build_images.sh            # build (parallel) then push (serial; needs docker login)
 #
 # Parallel stdout would be an unreadable interleave, so each build streams to its own log file:
@@ -33,7 +39,7 @@
 set -euo pipefail
 
 REGISTRY="${REGISTRY:-gitea.psi.ch/leonarski_f}"
-TAG="${TAG:-2607b}"
+TAG="${TAG:-2609}"
 PUSH="${PUSH:-0}"
 JOBS="${JOBS:-2}"
 
@@ -54,7 +60,7 @@ build_one() {
     local v="$1"
     local img="$REGISTRY/jfjoch_$v:$TAG"
     local log="$logdir/${v}-${TAG}.log"
-    if docker build --pull -t "$img" "$here/$v" >"$log" 2>&1; then
+    if docker build --pull -t "$img" -f "$here/$v/Dockerfile" "$here" >"$log" 2>&1; then
         echo OK   > "$logdir/${v}-${TAG}.status"
     else
         echo FAIL > "$logdir/${v}-${TAG}.status"
diff --git a/docker/common/README.md b/docker/common/README.md
new file mode 100644
index 000000000..736a848ce
--- /dev/null
+++ b/docker/common/README.md
@@ -0,0 +1,21 @@
+# Shared build-image steps
+
+`docker/rocky8`, `docker/rocky9`, `docker/ubuntu2204` and `docker/ubuntu2404` differ only in their
+package manager, their package list and a few distro-specific extras (DIALS and XDS on rocky9, the
+aarch64 cross toolchain on ubuntu2404, the release tooling on rocky8). Everything built from
+source is identical in all four, so it lives here and is run by each Dockerfile in this order:
+
+| script | what it installs |
+|---|---|
+| `install-cmake.sh` | CMake, pinned, from cmake.org -- the distro CMake is not used |
+| `build-openssl.sh` | static OpenSSL into `/opt/openssl-$OPENSSL_VERSION` |
+| `build-dbus.sh` | static libdbus into `/opt/dbus-$DBUS_VERSION-static` |
+| `build-qt.sh` | static Qt 6 into `$QT_PREFIX` |
+| `install-eigen.sh` | Eigen 3.4 into `/opt/eigen-3.4` |
+
+They read their versions from the ARGs of the Dockerfile that runs them, and each one is the
+verbatim shell that used to be inlined four times. Keeping one copy is the point: the HTTP/1.1 git
+fix once landed in the two Ubuntu images and neither Rocky one, because there were four copies to
+remember.
+
+The build context is therefore `docker/`, not `docker/<variant>/` -- see `build_images.sh`.
diff --git a/docker/common/build-dbus.sh b/docker/common/build-dbus.sh
new file mode 100755
index 000000000..481e52609
--- /dev/null
+++ b/docker/common/build-dbus.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Static libdbus, so the viewer links D-Bus in rather than pulling libdbus-1.so.3 -- and with it
+# libsystemd and libselinux -- at runtime. The viewer is a pure session-bus client, so the daemon-side
+# systemd/selinux features are off; built -fPIC so the archive links into Qt's PIE tools.
+#
+# Shared by all four build images (docker/*/Dockerfile). The build context is docker/, so each
+# Dockerfile reaches this with COPY common/. Version inputs come from that Dockerfile's ARGs.
+
+set -eux; \
+    cd /tmp; \
+    curl -LO https://dbus.freedesktop.org/releases/dbus/dbus-${DBUS_VERSION}.tar.xz; \
+    tar -xf dbus-${DBUS_VERSION}.tar.xz; \
+    cd dbus-${DBUS_VERSION}; \
+    ./configure --prefix=/opt/dbus-${DBUS_VERSION}-static \
+      --enable-static --disable-shared --with-pic \
+      --disable-systemd --without-systemdsystemunitdir \
+      --disable-selinux --disable-apparmor --disable-libaudit \
+      --disable-tests --disable-asserts \
+      --disable-doxygen-docs --disable-xml-docs --disable-ducktype-docs \
+      CFLAGS="-fPIC"; \
+    make -j"$(nproc)"; \
+    make install; \
+    cd /; rm -rf /tmp/dbus-${DBUS_VERSION} /tmp/dbus-${DBUS_VERSION}.tar.xz
diff --git a/docker/common/build-openssl.sh b/docker/common/build-openssl.sh
new file mode 100755
index 000000000..756114d12
--- /dev/null
+++ b/docker/common/build-openssl.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Static OpenSSL into /opt/openssl-$OPENSSL_VERSION.
+#
+# Shared by all four build images (docker/*/Dockerfile). The build context is docker/, so each
+# Dockerfile reaches this with COPY common/. Version inputs come from that Dockerfile's ARGs.
+
+set -eux; \
+    cd /tmp; \
+    curl -LO https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz; \
+    tar -xf openssl-${OPENSSL_VERSION}.tar.gz; \
+    cd openssl-${OPENSSL_VERSION}; \
+    ./Configure linux-x86_64 no-shared no-module no-tests --prefix=/opt/openssl-${OPENSSL_VERSION} --libdir=lib; \
+    make -j"$(nproc)"; \
+    make install_sw; \
+    cd /; rm -rf /tmp/openssl-${OPENSSL_VERSION} /tmp/openssl-${OPENSSL_VERSION}.tar.gz
diff --git a/docker/common/build-qt.sh b/docker/common/build-qt.sh
new file mode 100755
index 000000000..ed0ab0e8d
--- /dev/null
+++ b/docker/common/build-qt.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+# Static Qt 6 (Core, Gui, Widgets, Charts, DBus) into $QT_PREFIX.
+#
+# Shared by all four build images (docker/*/Dockerfile). The build context is docker/, so each
+# Dockerfile reaches this with COPY common/. Version inputs come from that Dockerfile's ARGs.
+
+set -eux
+
+# The download path carries the SERIES (6.11), the tarball the full version (6.11.1); deriving one
+# from the other is what stops a version bump from silently 404ing on the old series directory.
+QT_SERIES=${QT_VERSION%.*}
+
+set -eux; \
+    cd /tmp; \
+    curl -LO https://download.qt.io/official_releases/qt/${QT_SERIES}/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz; \
+    tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz; \
+    mkdir -p qt-everywhere-src-${QT_VERSION}/build && cd qt-everywhere-src-${QT_VERSION}/build; \
+    cmake -G Ninja \
+      -DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qtdeclarative;qtcharts;qt3d" \
+      -DBUILD_SHARED_LIBS=OFF \
+      -DQT_BUILD_TESTS=OFF \
+      -DQT_BUILD_EXAMPLES=OFF \
+      -DQT_FEATURE_dbus=ON \
+      -DQT_FEATURE_dbus_linked=ON \
+      -DDBus1_DIR=/opt/dbus-${DBUS_VERSION}-static/lib/cmake/DBus1 \
+      -DQT_FEATURE_xcb=ON \
+      -DQT_FEATURE_xcb_xlib=OFF \
+      -DQT_FEATURE_xkbcommon_x11=ON \
+      -DQT_FEATURE_opengl=ON \
+      -DQT_FEATURE_opengl_desktop=ON \
+      -DQT_FEATURE_opengl_dynamic=OFF \
+      -DQT_FEATURE_vulkan=OFF \
+      -DQT_FEATURE_glib=OFF \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
+      -DCMAKE_C_COMPILER=${CC} \
+      -DCMAKE_CXX_COMPILER=${CXX} \
+      -DQT_FEATURE_openssl=ON \
+      -DQT_FEATURE_openssl_linked=ON \
+      -DOPENSSL_USE_STATIC_LIBS=TRUE \
+      ..; \
+    cmake --build . -j"$(nproc)"; \
+    cmake --install .; \
+    cd /; rm -rf /tmp/qt-everywhere-src-${QT_VERSION} /tmp/qt-everywhere-src-${QT_VERSION}.tar.xz
diff --git a/docker/common/install-cmake.sh b/docker/common/install-cmake.sh
new file mode 100755
index 000000000..efca13b61
--- /dev/null
+++ b/docker/common/install-cmake.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+# CMake, pinned, from Kitware's own download host.
+#
+# Shared by all four build images (docker/*/Dockerfile). The build context is docker/, so each
+# Dockerfile reaches this with COPY common/. Version inputs come from that Dockerfile's ARGs.
+#
+# The distro CMake is deliberately NOT installed: the four base images ship three different
+# versions (EL8 3.26.5, EL9 3.31.8, Jammy 3.22, Noble 3.28.3), and they move under us at every
+# base-image refresh. That spread is what makes a configure fail on one image and pass on the
+# next -- policy defaults and FetchContent behaviour both depend on it. One pinned CMake
+# everywhere removes the whole class of problem, and it is the only such tool the build cannot
+# pin from inside the repository.
+#
+# cmake.org rather than the GitHub release asset: the images already fetch everything else from
+# GitHub, and GitHub throttles unauthenticated downloads by TLS fingerprint.
+set -eux
+
+: "${CMAKE_VERSION:?set CMAKE_VERSION}"
+: "${CMAKE_SHA256:?set CMAKE_SHA256}"
+
+series=${CMAKE_VERSION%.*}
+tarball=cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz
+
+cd /tmp
+curl -fLO "https://cmake.org/files/v${series}/${tarball}"
+echo "${CMAKE_SHA256}  ${tarball}" | sha256sum -c -
+mkdir -p "/opt/cmake-${CMAKE_VERSION}"
+tar -xzf "${tarball}" -C "/opt/cmake-${CMAKE_VERSION}" --strip-components=1
+rm -f "${tarball}"
+
+# The Dockerfile puts /opt/cmake-$CMAKE_VERSION/bin on PATH; check the pin took.
+test "$("/opt/cmake-${CMAKE_VERSION}/bin/cmake" --version | head -1)" = "cmake version ${CMAKE_VERSION}"
diff --git a/docker/common/install-eigen.sh b/docker/common/install-eigen.sh
new file mode 100755
index 000000000..e0d3d512f
--- /dev/null
+++ b/docker/common/install-eigen.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Eigen, the external find_package(Eigen3 3.4) dependency, into /opt/eigen-3.4. Header-only;
+# 3.4.x is required because Eigen's same-major-version rule rejects 5.x.
+#
+# Shared by all four build images (docker/*/Dockerfile). The build context is docker/, so each
+# Dockerfile reaches this with COPY common/. Version inputs come from that Dockerfile's ARGs.
+
+set -eux; \
+    cd /tmp; \
+    git clone --depth 1 --branch ${EIGEN_VERSION} https://gitlab.com/libeigen/eigen.git; \
+    cmake -G Ninja -S eigen -B eigen-build -DCMAKE_INSTALL_PREFIX=/opt/eigen-3.4 \
+      -DEIGEN_BUILD_BLAS=OFF -DEIGEN_BUILD_LAPACK=OFF -DEIGEN_BUILD_DOC=OFF -DBUILD_TESTING=OFF; \
+    cmake --install eigen-build; \
+    cd /; rm -rf /tmp/eigen /tmp/eigen-build
diff --git a/docker/common/install-ninja.sh b/docker/common/install-ninja.sh
new file mode 100755
index 000000000..2582ce376
--- /dev/null
+++ b/docker/common/install-ninja.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+# Ninja, pinned, from the upstream release binary.
+#
+# Shared by all four build images (docker/*/Dockerfile). The build context is docker/, so each
+# Dockerfile reaches this with COPY common/. Version inputs come from that Dockerfile's ARGs.
+#
+# Pinned for the same reason as CMake: the distro versions span 1.8.2 (EL8) to 1.11.1 (Noble), and
+# 1.8.2 is too old to parse what recent Qt generates -- it fails with "multiple outputs aren't
+# supported by depslog", which is a ninja limitation lifted in 1.10, not anything wrong with Qt.
+#
+# The zip is unpacked with python3 rather than unzip: python3 is in every image already and unzip
+# is not, so this needs no extra package.
+set -eux
+
+: "${NINJA_VERSION:?set NINJA_VERSION}"
+: "${NINJA_SHA256:?set NINJA_SHA256}"
+
+cd /tmp
+curl -fLO "https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-linux.zip"
+echo "${NINJA_SHA256}  ninja-linux.zip" | sha256sum -c -
+mkdir -p "/opt/ninja-${NINJA_VERSION}/bin"
+python3 -m zipfile -e ninja-linux.zip "/opt/ninja-${NINJA_VERSION}/bin"
+chmod +x "/opt/ninja-${NINJA_VERSION}/bin/ninja"
+rm -f ninja-linux.zip
+
+test "$("/opt/ninja-${NINJA_VERSION}/bin/ninja" --version)" = "${NINJA_VERSION}"
diff --git a/docker/rocky8/Dockerfile b/docker/rocky8/Dockerfile
index f3db6b7ff..d349de053 100644
--- a/docker/rocky8/Dockerfile
+++ b/docker/rocky8/Dockerfile
@@ -2,7 +2,7 @@ FROM nvidia/cuda:12.9.1-devel-rockylinux8
 LABEL authors="leonarski_f"
 
 ARG OPENSSL_VERSION=3.5.4
-ARG QT_VERSION=6.9.1
+ARG QT_VERSION=6.11.1
 ARG DBUS_VERSION=1.14.10
 ARG NODE_MAJOR=22
 ARG EIGEN_VERSION=3.4.0
@@ -22,7 +22,6 @@ RUN dnf -y install epel-release && \
       tar \
       xz \
       make \
-      cmake \
       nasm \
       gcc-toolset-13 \
       gcc-toolset-13-gcc \
@@ -32,7 +31,6 @@ RUN dnf -y install epel-release && \
       rpmdevtools \
       numactl-devel \
       redhat-rpm-config \
-      ninja-build \
       libxcb-devel \
       xcb-util-*-devel \
       xcb-util-devel \
@@ -51,7 +49,6 @@ RUN dnf -y install epel-release && \
       expat-devel \
       krb5-devel \
       zlib-devel \
-      zlib-static \
       fontconfig-devel \
       zlib-static \
       java-21-openjdk-headless \
@@ -69,15 +66,20 @@ RUN dnf -y install epel-release && \
       freetype-devel && \
     dnf clean all && rm -rf /var/cache/dnf
 
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz; \
-    tar -xf openssl-${OPENSSL_VERSION}.tar.gz; \
-    cd openssl-${OPENSSL_VERSION}; \
-    ./Configure linux-x86_64 no-shared no-module no-tests --prefix=/opt/openssl-${OPENSSL_VERSION} --libdir=lib; \
-    make -j"$(nproc)"; \
-    make install_sw; \
-    cd /; rm -rf /tmp/openssl-${OPENSSL_VERSION} /tmp/openssl-${OPENSSL_VERSION}.tar.gz
+# Everything built from source below is identical in all four build images, so it lives in
+# docker/common/ and is run from there -- one copy to change, not four. The build context is
+# docker/ (see build_images.sh), which is what puts common/ in reach of this COPY.
+ARG CMAKE_VERSION=3.31.8
+ARG CMAKE_SHA256=630615d8e98ac33eba7fbe472626dff5c899c85af3c024585ae109166a6909d0
+ARG NINJA_VERSION=1.13.2
+ARG NINJA_SHA256=5749cbc4e668273514150a80e387a957f933c6ed3f5f11e03fb30955e2bbead6
+COPY common/ /opt/jfjoch-common/
+RUN /opt/jfjoch-common/install-cmake.sh
+RUN /opt/jfjoch-common/install-ninja.sh
+# Ahead of the distro path: these are the CMake and Ninja every later step and every CI build uses.
+ENV PATH=/opt/cmake-${CMAKE_VERSION}/bin:/opt/ninja-${NINJA_VERSION}/bin:${PATH}
+
+RUN /opt/jfjoch-common/build-openssl.sh
 
 # Expose static OpenSSL to CMake/pkg-config
 ENV OPENSSL_ROOT_DIR=/opt/openssl-${OPENSSL_VERSION}
@@ -106,67 +108,16 @@ ENV PKG_CONFIG_PATH=${OPENSSL_ROOT_DIR}/lib/pkgconfig:${OPENSSL_ROOT_DIR}/lib64/
 # installs, which imports libdbus-1.a). Built -fPIC (--with-pic) so the archive links into Qt's PIE
 # tools (qdbusxml2cpp). expat is only a configure-time dep of the dbus daemon; the client libdbus-1
 # links neither expat nor systemd.
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://dbus.freedesktop.org/releases/dbus/dbus-${DBUS_VERSION}.tar.xz; \
-    tar -xf dbus-${DBUS_VERSION}.tar.xz; \
-    cd dbus-${DBUS_VERSION}; \
-    ./configure --prefix=/opt/dbus-${DBUS_VERSION}-static \
-      --enable-static --disable-shared --with-pic \
-      --disable-systemd --without-systemdsystemunitdir \
-      --disable-selinux --disable-apparmor --disable-libaudit \
-      --disable-tests --disable-asserts \
-      --disable-doxygen-docs --disable-xml-docs --disable-ducktype-docs \
-      CFLAGS="-fPIC"; \
-    make -j"$(nproc)"; \
-    make install; \
-    cd /; rm -rf /tmp/dbus-${DBUS_VERSION} /tmp/dbus-${DBUS_VERSION}.tar.xz
+RUN /opt/jfjoch-common/build-dbus.sh
 
 # Put the static libdbus pkgconfig ahead of the system one so Qt6::DBus resolves to the .a
 ENV PKG_CONFIG_PATH=/opt/dbus-${DBUS_VERSION}-static/lib/pkgconfig:${PKG_CONFIG_PATH}
 
 ARG QT_PREFIX=/opt/qt-${QT_VERSION}-static
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://download.qt.io/official_releases/qt/6.9/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz; \
-    tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz; \
-    mkdir -p qt-everywhere-src-${QT_VERSION}/build && cd qt-everywhere-src-${QT_VERSION}/build; \
-    cmake -G Ninja \
-      -DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qtdeclarative;qtcharts;qt3d" \
-      -DBUILD_SHARED_LIBS=OFF \
-      -DQT_BUILD_TESTS=OFF \
-      -DQT_BUILD_EXAMPLES=OFF \
-      -DQT_FEATURE_dbus=ON \
-      -DQT_FEATURE_dbus_linked=ON \
-      -DDBus1_DIR=/opt/dbus-${DBUS_VERSION}-static/lib/cmake/DBus1 \
-      -DQT_FEATURE_xcb=ON \
-      -DQT_FEATURE_xcb_xlib=OFF \
-      -DQT_FEATURE_xkbcommon_x11=ON \
-      -DQT_FEATURE_opengl=ON \
-      -DQT_FEATURE_opengl_desktop=ON \
-      -DQT_FEATURE_opengl_dynamic=OFF \
-      -DQT_FEATURE_vulkan=OFF \
-      -DQT_FEATURE_glib=OFF \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
-      -DCMAKE_C_COMPILER=${CC} \
-      -DCMAKE_CXX_COMPILER=${CXX} \
-      -DQT_FEATURE_openssl=ON \
-      -DQT_FEATURE_openssl_linked=ON \
-      -DOPENSSL_USE_STATIC_LIBS=TRUE \
-      ..; \
-    cmake --build . -j"$(nproc)"; \
-    cmake --install .; \
-    cd /; rm -rf /tmp/qt-everywhere-src-${QT_VERSION} /tmp/qt-everywhere-src-${QT_VERSION}.tar.xz
+RUN /opt/jfjoch-common/build-qt.sh
 
 # Eigen 3.4 (header-only) -- external find_package(Eigen3 3.4) dependency, installed to /opt/eigen-3.4.
-RUN set -eux; \
-    cd /tmp; \
-    git clone --depth 1 --branch ${EIGEN_VERSION} https://gitlab.com/libeigen/eigen.git; \
-    cmake -G Ninja -S eigen -B eigen-build -DCMAKE_INSTALL_PREFIX=/opt/eigen-3.4 \
-      -DEIGEN_BUILD_BLAS=OFF -DEIGEN_BUILD_LAPACK=OFF -DEIGEN_BUILD_DOC=OFF -DBUILD_TESTING=OFF; \
-    cmake --install eigen-build; \
-    cd /; rm -rf /tmp/eigen /tmp/eigen-build
+RUN /opt/jfjoch-common/install-eigen.sh
 
 # Make Qt, the static libdbus, and Eigen discoverable by CMake. The static libdbus prefix is
 # required here (not only at Qt build time): every Qt6::DBus consumer re-runs find_package(DBus1)
@@ -178,3 +129,5 @@ WORKDIR /workspace
 
 # Default entrypoint prints tool versions and hints.
 CMD ["/bin/bash", "-l"]
+
+RUN rm -rf /opt/jfjoch-common
diff --git a/docker/rocky9/Dockerfile b/docker/rocky9/Dockerfile
index 57a513f8b..c46ef8613 100644
--- a/docker/rocky9/Dockerfile
+++ b/docker/rocky9/Dockerfile
@@ -2,7 +2,7 @@ FROM nvidia/cuda:13.3.0-devel-rockylinux9
 LABEL authors="leonarski_f"
 
 ARG OPENSSL_VERSION=3.5.4
-ARG QT_VERSION=6.9.1
+ARG QT_VERSION=6.11.1
 ARG DBUS_VERSION=1.14.10
 ARG NODE_MAJOR=22
 ARG EIGEN_VERSION=3.4.0
@@ -28,7 +28,6 @@ RUN dnf -y update && \
       tar \
       xz \
       make \
-      cmake \
       gcc-toolset-13 \
       gcc-toolset-13-gcc \
       gcc-toolset-13-gcc-c++ \
@@ -37,13 +36,12 @@ RUN dnf -y update && \
       rpmdevtools \
       numactl-devel \
       redhat-rpm-config \
-      ninja-build \
       python3 \
       python3.12 \
       perl \
       nasm \
       pkgconf-pkg-config \
-      libxcb-devel \
+      xcb-util-devel \
       xcb-util-*-devel \
       libxcb-devel \
       libxkbcommon-devel \
@@ -62,7 +60,6 @@ RUN dnf -y update && \
       krb5-devel \
       zlib-devel \
       zlib-static \
-      zlib-static \
       fontconfig-devel \
       mesa-dri-drivers \
       libdrm-devel \
@@ -73,15 +70,20 @@ RUN dnf -y update && \
       freetype-devel && \
     dnf clean all && rm -rf /var/cache/dnf
 
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz; \
-    tar -xf openssl-${OPENSSL_VERSION}.tar.gz; \
-    cd openssl-${OPENSSL_VERSION}; \
-    ./Configure linux-x86_64 no-shared no-module no-tests --prefix=/opt/openssl-${OPENSSL_VERSION} --libdir=lib; \
-    make -j"$(nproc)"; \
-    make install_sw; \
-    cd /; rm -rf /tmp/openssl-${OPENSSL_VERSION} /tmp/openssl-${OPENSSL_VERSION}.tar.gz
+# Everything built from source below is identical in all four build images, so it lives in
+# docker/common/ and is run from there -- one copy to change, not four. The build context is
+# docker/ (see build_images.sh), which is what puts common/ in reach of this COPY.
+ARG CMAKE_VERSION=3.31.8
+ARG CMAKE_SHA256=630615d8e98ac33eba7fbe472626dff5c899c85af3c024585ae109166a6909d0
+ARG NINJA_VERSION=1.13.2
+ARG NINJA_SHA256=5749cbc4e668273514150a80e387a957f933c6ed3f5f11e03fb30955e2bbead6
+COPY common/ /opt/jfjoch-common/
+RUN /opt/jfjoch-common/install-cmake.sh
+RUN /opt/jfjoch-common/install-ninja.sh
+# Ahead of the distro path: these are the CMake and Ninja every later step and every CI build uses.
+ENV PATH=/opt/cmake-${CMAKE_VERSION}/bin:/opt/ninja-${NINJA_VERSION}/bin:${PATH}
+
+RUN /opt/jfjoch-common/build-openssl.sh
 
 # Expose static OpenSSL to CMake/pkg-config
 ENV OPENSSL_ROOT_DIR=/opt/openssl-${OPENSSL_VERSION}
@@ -109,59 +111,14 @@ ENV CXX=${GCC_TOOLSET_ROOT}/usr/bin/g++
 # installs, which imports libdbus-1.a). Built -fPIC (--with-pic) so the archive links into Qt's PIE
 # tools (qdbusxml2cpp). expat is only a configure-time dep of the dbus daemon; the client libdbus-1
 # links neither expat nor systemd.
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://dbus.freedesktop.org/releases/dbus/dbus-${DBUS_VERSION}.tar.xz; \
-    tar -xf dbus-${DBUS_VERSION}.tar.xz; \
-    cd dbus-${DBUS_VERSION}; \
-    ./configure --prefix=/opt/dbus-${DBUS_VERSION}-static \
-      --enable-static --disable-shared --with-pic \
-      --disable-systemd --without-systemdsystemunitdir \
-      --disable-selinux --disable-apparmor --disable-libaudit \
-      --disable-tests --disable-asserts \
-      --disable-doxygen-docs --disable-xml-docs --disable-ducktype-docs \
-      CFLAGS="-fPIC"; \
-    make -j"$(nproc)"; \
-    make install; \
-    cd /; rm -rf /tmp/dbus-${DBUS_VERSION} /tmp/dbus-${DBUS_VERSION}.tar.xz
+RUN /opt/jfjoch-common/build-dbus.sh
 
 # Put the static libdbus pkgconfig ahead of the system one so Qt6::DBus resolves to the .a
 ENV PKG_CONFIG_PATH=/opt/dbus-${DBUS_VERSION}-static/lib/pkgconfig:${PKG_CONFIG_PATH}
 
 # Build and install static Qt 6.9 with Core, Gui, Widgets, Charts, DBus
 ARG QT_PREFIX=/opt/qt-${QT_VERSION}-static
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://download.qt.io/official_releases/qt/6.9/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz; \
-    tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz; \
-    mkdir -p qt-everywhere-src-${QT_VERSION}/build && cd qt-everywhere-src-${QT_VERSION}/build; \
-    cmake -G Ninja \
-      -DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qtdeclarative;qtcharts;qt3d" \
-      -DBUILD_SHARED_LIBS=OFF \
-      -DQT_BUILD_TESTS=OFF \
-      -DQT_BUILD_EXAMPLES=OFF \
-      -DQT_FEATURE_dbus=ON \
-      -DQT_FEATURE_dbus_linked=ON \
-      -DDBus1_DIR=/opt/dbus-${DBUS_VERSION}-static/lib/cmake/DBus1 \
-      -DQT_FEATURE_xcb=ON \
-      -DQT_FEATURE_xcb_xlib=OFF \
-      -DQT_FEATURE_xkbcommon_x11=ON \
-      -DQT_FEATURE_opengl=ON \
-      -DQT_FEATURE_opengl_desktop=ON \
-      -DQT_FEATURE_opengl_dynamic=OFF \
-      -DQT_FEATURE_vulkan=OFF \
-      -DQT_FEATURE_glib=OFF \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
-      -DCMAKE_C_COMPILER=${CC} \
-      -DCMAKE_CXX_COMPILER=${CXX} \
-      -DQT_FEATURE_openssl=ON \
-      -DQT_FEATURE_openssl_linked=ON \
-      -DOPENSSL_USE_STATIC_LIBS=TRUE \
-      ..; \
-    cmake --build . -j"$(nproc)"; \
-    cmake --install .; \
-    cd /; rm -rf /tmp/qt-everywhere-src-${QT_VERSION} /tmp/qt-everywhere-src-${QT_VERSION}.tar.xz
+RUN /opt/jfjoch-common/build-qt.sh
 
 # Install DIALS using the official binary tarball workflow
 RUN set -eux; \
@@ -199,13 +156,7 @@ RUN set -eux; \
           https://gitea.psi.ch/mx/durin/releases/download/1.0.0/libdurin-plugin.so.1.0.0
 
 # Eigen 3.4 (header-only) -- external find_package(Eigen3 3.4) dependency, installed to /opt/eigen-3.4.
-RUN set -eux; \
-    cd /tmp; \
-    git clone --depth 1 --branch ${EIGEN_VERSION} https://gitlab.com/libeigen/eigen.git; \
-    cmake -G Ninja -S eigen -B eigen-build -DCMAKE_INSTALL_PREFIX=/opt/eigen-3.4 \
-      -DEIGEN_BUILD_BLAS=OFF -DEIGEN_BUILD_LAPACK=OFF -DEIGEN_BUILD_DOC=OFF -DBUILD_TESTING=OFF; \
-    cmake --install eigen-build; \
-    cd /; rm -rf /tmp/eigen /tmp/eigen-build
+RUN /opt/jfjoch-common/install-eigen.sh
 
 # Make Qt, the static libdbus, and Eigen discoverable by CMake. The static libdbus prefix is
 # required here (not only at Qt build time): every Qt6::DBus consumer re-runs find_package(DBus1)
@@ -221,3 +172,5 @@ WORKDIR /workspace
 
 # Default entrypoint: interactive shell
 CMD ["/bin/bash", "-l"]
+
+RUN rm -rf /opt/jfjoch-common
diff --git a/docker/ubuntu2204/Dockerfile b/docker/ubuntu2204/Dockerfile
index 565883012..f2216d01e 100644
--- a/docker/ubuntu2204/Dockerfile
+++ b/docker/ubuntu2204/Dockerfile
@@ -5,7 +5,7 @@ LABEL authors="leonarski_f"
 ENV DEBIAN_FRONTEND=noninteractive
 
 ARG OPENSSL_VERSION=3.5.4
-ARG QT_VERSION=6.9.1
+ARG QT_VERSION=6.11.1
 ARG DBUS_VERSION=1.14.10
 ARG NODE_MAJOR=22
 ARG EIGEN_VERSION=3.4.0
@@ -28,7 +28,6 @@ RUN set -eux; \
       tar \
       xz-utils \
       build-essential \
-      ninja-build \
       python3 \
       python3-venv \
       python3-requests \
@@ -80,35 +79,35 @@ RUN set -eux; \
       libassimp-dev \
       libglvnd-dev \
       libfreetype6-dev; \
-    wget -qO- https://apt.kitware.com/keys/kitware-archive-latest.asc \
-      | gpg --dearmor \
-      | tee /usr/share/keyrings/kitware-archive-keyring.gpg > /dev/null; \
-    echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main" \
-      | tee /etc/apt/sources.list.d/kitware.list > /dev/null; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-      cmake=3.26.* \
-      cmake-data=3.26.* \
-      kitware-archive-keyring; \
     apt-get -y install gcc-12 g++-12; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
+# Git over HTTP/1.1: the HTTP/2 multiplexing used by default makes clones from some servers
+# (and through the PSI proxy) fail mid-transfer with "RPC failed; curl 92 HTTP/2 stream ... not
+# closed cleanly". Every source dependency below and the project's own FetchContent step clone over
+# HTTPS, so set this system-wide for the image.
+RUN git config --system http.version HTTP/1.1
+
 # Use GCC/G++ 12 for builds
 ENV CC=/usr/bin/gcc-12
 ENV CXX=/usr/bin/g++-12
-ENV PATH=/usr/bin:${PATH}
 
 # Build a static OpenSSL
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz; \
-    tar -xf openssl-${OPENSSL_VERSION}.tar.gz; \
-    cd openssl-${OPENSSL_VERSION}; \
-    ./Configure linux-x86_64 no-shared no-module no-tests --prefix=/opt/openssl-${OPENSSL_VERSION} --libdir=lib; \
-    make -j"$(nproc)"; \
-    make install_sw; \
-    cd /; rm -rf /tmp/openssl-${OPENSSL_VERSION} /tmp/openssl-${OPENSSL_VERSION}.tar.gz
+# Everything built from source below is identical in all four build images, so it lives in
+# docker/common/ and is run from there -- one copy to change, not four. The build context is
+# docker/ (see build_images.sh), which is what puts common/ in reach of this COPY.
+ARG CMAKE_VERSION=3.31.8
+ARG CMAKE_SHA256=630615d8e98ac33eba7fbe472626dff5c899c85af3c024585ae109166a6909d0
+ARG NINJA_VERSION=1.13.2
+ARG NINJA_SHA256=5749cbc4e668273514150a80e387a957f933c6ed3f5f11e03fb30955e2bbead6
+COPY common/ /opt/jfjoch-common/
+RUN /opt/jfjoch-common/install-cmake.sh
+RUN /opt/jfjoch-common/install-ninja.sh
+# Ahead of the distro path: these are the CMake and Ninja every later step and every CI build uses.
+ENV PATH=/opt/cmake-${CMAKE_VERSION}/bin:/opt/ninja-${NINJA_VERSION}/bin:${PATH}
+
+RUN /opt/jfjoch-common/build-openssl.sh
 
 # Expose static OpenSSL to CMake/pkg-config
 ENV OPENSSL_ROOT_DIR=/opt/openssl-${OPENSSL_VERSION}
@@ -133,68 +132,17 @@ RUN set -eux; \
 # installs, which imports libdbus-1.a). Built -fPIC (--with-pic) so the archive links into Qt's PIE
 # tools (qdbusxml2cpp). expat is only a configure-time dep of the dbus daemon; the client libdbus-1
 # links neither expat nor systemd.
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://dbus.freedesktop.org/releases/dbus/dbus-${DBUS_VERSION}.tar.xz; \
-    tar -xf dbus-${DBUS_VERSION}.tar.xz; \
-    cd dbus-${DBUS_VERSION}; \
-    ./configure --prefix=/opt/dbus-${DBUS_VERSION}-static \
-      --enable-static --disable-shared --with-pic \
-      --disable-systemd --without-systemdsystemunitdir \
-      --disable-selinux --disable-apparmor --disable-libaudit \
-      --disable-tests --disable-asserts \
-      --disable-doxygen-docs --disable-xml-docs --disable-ducktype-docs \
-      CFLAGS="-fPIC"; \
-    make -j"$(nproc)"; \
-    make install; \
-    cd /; rm -rf /tmp/dbus-${DBUS_VERSION} /tmp/dbus-${DBUS_VERSION}.tar.xz
+RUN /opt/jfjoch-common/build-dbus.sh
 
 # Put the static libdbus pkgconfig ahead of the system one so Qt6::DBus resolves to the .a
 ENV PKG_CONFIG_PATH=/opt/dbus-${DBUS_VERSION}-static/lib/pkgconfig:${PKG_CONFIG_PATH}
 
 # Build and install static Qt with Core, Gui, Widgets, Charts, DBus
 ARG QT_PREFIX=/opt/qt-${QT_VERSION}-static
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://download.qt.io/official_releases/qt/6.9/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz; \
-    tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz; \
-    mkdir -p qt-everywhere-src-${QT_VERSION}/build && cd qt-everywhere-src-${QT_VERSION}/build; \
-    cmake -G Ninja \
-      -DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qtdeclarative;qtcharts;qt3d" \
-      -DBUILD_SHARED_LIBS=OFF \
-      -DQT_BUILD_TESTS=OFF \
-      -DQT_BUILD_EXAMPLES=OFF \
-      -DQT_FEATURE_dbus=ON \
-      -DQT_FEATURE_dbus_linked=ON \
-      -DDBus1_DIR=/opt/dbus-${DBUS_VERSION}-static/lib/cmake/DBus1 \
-      -DQT_FEATURE_xcb=ON \
-      -DQT_FEATURE_xcb_xlib=OFF \
-      -DQT_FEATURE_xkbcommon_x11=ON \
-      -DQT_FEATURE_opengl=ON \
-      -DQT_FEATURE_opengl_desktop=ON \
-      -DQT_FEATURE_opengl_dynamic=OFF \
-      -DQT_FEATURE_vulkan=OFF \
-      -DQT_FEATURE_glib=OFF \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
-      -DCMAKE_C_COMPILER=${CC} \
-      -DCMAKE_CXX_COMPILER=${CXX} \
-      -DQT_FEATURE_openssl=ON \
-      -DQT_FEATURE_openssl_linked=ON \
-      -DOPENSSL_USE_STATIC_LIBS=TRUE \
-      ..; \
-    cmake --build . -j"$(nproc)"; \
-    cmake --install .; \
-    cd /; rm -rf /tmp/qt-everywhere-src-${QT_VERSION} /tmp/qt-everywhere-src-${QT_VERSION}.tar.xz
+RUN /opt/jfjoch-common/build-qt.sh
 
 # Eigen 3.4 (header-only) -- external find_package(Eigen3 3.4) dependency, installed to /opt/eigen-3.4.
-RUN set -eux; \
-    cd /tmp; \
-    git clone --depth 1 --branch ${EIGEN_VERSION} https://gitlab.com/libeigen/eigen.git; \
-    cmake -G Ninja -S eigen -B eigen-build -DCMAKE_INSTALL_PREFIX=/opt/eigen-3.4 \
-      -DEIGEN_BUILD_BLAS=OFF -DEIGEN_BUILD_LAPACK=OFF -DEIGEN_BUILD_DOC=OFF -DBUILD_TESTING=OFF; \
-    cmake --install eigen-build; \
-    cd /; rm -rf /tmp/eigen /tmp/eigen-build
+RUN /opt/jfjoch-common/install-eigen.sh
 
 # Make Qt, the static libdbus, and Eigen discoverable by CMake. The static libdbus prefix is
 # required here (not only at Qt build time): every Qt6::DBus consumer re-runs find_package(DBus1)
@@ -206,3 +154,5 @@ WORKDIR /workspace
 
 # Default entrypoint: interactive shell
 CMD ["/bin/bash", "-l"]
+
+RUN rm -rf /opt/jfjoch-common
diff --git a/docker/ubuntu2404/Dockerfile b/docker/ubuntu2404/Dockerfile
index 8fcc26ce3..65c8051a8 100644
--- a/docker/ubuntu2404/Dockerfile
+++ b/docker/ubuntu2404/Dockerfile
@@ -5,7 +5,7 @@ LABEL authors="leonarski_f"
 ENV DEBIAN_FRONTEND=noninteractive
 
 ARG OPENSSL_VERSION=3.5.4
-ARG QT_VERSION=6.9.1
+ARG QT_VERSION=6.11.1
 ARG DBUS_VERSION=1.14.10
 ARG NODE_MAJOR=22
 ARG EIGEN_VERSION=3.4.0
@@ -39,8 +39,6 @@ RUN set -eux; \
       tar \
       xz-utils \
       build-essential \
-      cmake \
-      ninja-build \
       python3 \
       python3-venv \
       python3-requests \
@@ -94,20 +92,31 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
+# Git over HTTP/1.1: the HTTP/2 multiplexing used by default makes clones from some servers
+# (and through the PSI proxy) fail mid-transfer with "RPC failed; curl 92 HTTP/2 stream ... not
+# closed cleanly". Every source dependency below and the project's own FetchContent step clone over
+# HTTPS, so set this system-wide for the image.
+RUN git config --system http.version HTTP/1.1
+
 # Use the default GCC/G++ (gcc-13 on Noble, supported by CUDA 13.3)
 ENV CC=/usr/bin/gcc
 ENV CXX=/usr/bin/g++
 
 # Build a static OpenSSL
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz; \
-    tar -xf openssl-${OPENSSL_VERSION}.tar.gz; \
-    cd openssl-${OPENSSL_VERSION}; \
-    ./Configure linux-x86_64 no-shared no-module no-tests --prefix=/opt/openssl-${OPENSSL_VERSION} --libdir=lib; \
-    make -j"$(nproc)"; \
-    make install_sw; \
-    cd /; rm -rf /tmp/openssl-${OPENSSL_VERSION} /tmp/openssl-${OPENSSL_VERSION}.tar.gz
+# Everything built from source below is identical in all four build images, so it lives in
+# docker/common/ and is run from there -- one copy to change, not four. The build context is
+# docker/ (see build_images.sh), which is what puts common/ in reach of this COPY.
+ARG CMAKE_VERSION=3.31.8
+ARG CMAKE_SHA256=630615d8e98ac33eba7fbe472626dff5c899c85af3c024585ae109166a6909d0
+ARG NINJA_VERSION=1.13.2
+ARG NINJA_SHA256=5749cbc4e668273514150a80e387a957f933c6ed3f5f11e03fb30955e2bbead6
+COPY common/ /opt/jfjoch-common/
+RUN /opt/jfjoch-common/install-cmake.sh
+RUN /opt/jfjoch-common/install-ninja.sh
+# Ahead of the distro path: these are the CMake and Ninja every later step and every CI build uses.
+ENV PATH=/opt/cmake-${CMAKE_VERSION}/bin:/opt/ninja-${NINJA_VERSION}/bin:${PATH}
+
+RUN /opt/jfjoch-common/build-openssl.sh
 
 # Expose static OpenSSL to CMake/pkg-config
 ENV OPENSSL_ROOT_DIR=/opt/openssl-${OPENSSL_VERSION}
@@ -132,68 +141,17 @@ RUN set -eux; \
 # installs, which imports libdbus-1.a). Built -fPIC (--with-pic) so the archive links into Qt's PIE
 # tools (qdbusxml2cpp). expat is only a configure-time dep of the dbus daemon; the client libdbus-1
 # links neither expat nor systemd.
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://dbus.freedesktop.org/releases/dbus/dbus-${DBUS_VERSION}.tar.xz; \
-    tar -xf dbus-${DBUS_VERSION}.tar.xz; \
-    cd dbus-${DBUS_VERSION}; \
-    ./configure --prefix=/opt/dbus-${DBUS_VERSION}-static \
-      --enable-static --disable-shared --with-pic \
-      --disable-systemd --without-systemdsystemunitdir \
-      --disable-selinux --disable-apparmor --disable-libaudit \
-      --disable-tests --disable-asserts \
-      --disable-doxygen-docs --disable-xml-docs --disable-ducktype-docs \
-      CFLAGS="-fPIC"; \
-    make -j"$(nproc)"; \
-    make install; \
-    cd /; rm -rf /tmp/dbus-${DBUS_VERSION} /tmp/dbus-${DBUS_VERSION}.tar.xz
+RUN /opt/jfjoch-common/build-dbus.sh
 
 # Put the static libdbus pkgconfig ahead of the system one so Qt6::DBus resolves to the .a
 ENV PKG_CONFIG_PATH=/opt/dbus-${DBUS_VERSION}-static/lib/pkgconfig:${PKG_CONFIG_PATH}
 
 # Build and install static Qt with Core, Gui, Widgets, Charts, DBus
 ARG QT_PREFIX=/opt/qt-${QT_VERSION}-static
-RUN set -eux; \
-    cd /tmp; \
-    curl -LO https://download.qt.io/official_releases/qt/6.9/${QT_VERSION}/single/qt-everywhere-src-${QT_VERSION}.tar.xz; \
-    tar -xf qt-everywhere-src-${QT_VERSION}.tar.xz; \
-    mkdir -p qt-everywhere-src-${QT_VERSION}/build && cd qt-everywhere-src-${QT_VERSION}/build; \
-    cmake -G Ninja \
-      -DQT_BUILD_SUBMODULES="qtbase;qtshadertools;qtdeclarative;qtcharts;qt3d" \
-      -DBUILD_SHARED_LIBS=OFF \
-      -DQT_BUILD_TESTS=OFF \
-      -DQT_BUILD_EXAMPLES=OFF \
-      -DQT_FEATURE_dbus=ON \
-      -DQT_FEATURE_dbus_linked=ON \
-      -DDBus1_DIR=/opt/dbus-${DBUS_VERSION}-static/lib/cmake/DBus1 \
-      -DQT_FEATURE_xcb=ON \
-      -DQT_FEATURE_xcb_xlib=OFF \
-      -DQT_FEATURE_xkbcommon_x11=ON \
-      -DQT_FEATURE_opengl=ON \
-      -DQT_FEATURE_opengl_desktop=ON \
-      -DQT_FEATURE_opengl_dynamic=OFF \
-      -DQT_FEATURE_vulkan=OFF \
-      -DQT_FEATURE_glib=OFF \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=${QT_PREFIX} \
-      -DCMAKE_C_COMPILER=${CC} \
-      -DCMAKE_CXX_COMPILER=${CXX} \
-      -DQT_FEATURE_openssl=ON \
-      -DQT_FEATURE_openssl_linked=ON \
-      -DOPENSSL_USE_STATIC_LIBS=TRUE \
-      ..; \
-    cmake --build . -j"$(nproc)"; \
-    cmake --install .; \
-    cd /; rm -rf /tmp/qt-everywhere-src-${QT_VERSION} /tmp/qt-everywhere-src-${QT_VERSION}.tar.xz
+RUN /opt/jfjoch-common/build-qt.sh
 
 # Eigen 3.4 (header-only) -- external find_package(Eigen3 3.4) dependency, installed to /opt/eigen-3.4.
-RUN set -eux; \
-    cd /tmp; \
-    git clone --depth 1 --branch ${EIGEN_VERSION} https://gitlab.com/libeigen/eigen.git; \
-    cmake -G Ninja -S eigen -B eigen-build -DCMAKE_INSTALL_PREFIX=/opt/eigen-3.4 \
-      -DEIGEN_BUILD_BLAS=OFF -DEIGEN_BUILD_LAPACK=OFF -DEIGEN_BUILD_DOC=OFF -DBUILD_TESTING=OFF; \
-    cmake --install eigen-build; \
-    cd /; rm -rf /tmp/eigen /tmp/eigen-build
+RUN /opt/jfjoch-common/install-eigen.sh
 
 # Make Qt, the static libdbus, and Eigen discoverable by CMake. The static libdbus prefix is
 # required here (not only at Qt build time): every Qt6::DBus consumer re-runs find_package(DBus1)
@@ -247,3 +205,5 @@ WORKDIR /workspace
 
 # Default entrypoint: interactive shell
 CMD ["/bin/bash", "-l"]
+
+RUN rm -rf /opt/jfjoch-common
diff --git a/docs/ACKNOWLEDGEMENT.md b/docs/ACKNOWLEDGEMENT.md
index ff16e348e..fefb076d0 100644
--- a/docs/ACKNOWLEDGEMENT.md
+++ b/docs/ACKNOWLEDGEMENT.md
@@ -105,7 +105,9 @@ cell" (1982), J. Appl. Cryst. 15, 255-259
 **[XDS](https://xds.mr.mpg.de/)** — rotation geometry and notation, the reciprocal Lorentz and
 partiality treatment, the maximum-likelihood mosaicity estimate, the `MINPK` criterion for rejecting
 a reflection whose predicted profile is not cleanly its own, the intensity-based test for a
-centred lattice, and the scaling correction surfaces indexed by image number and detector region. W. Kabsch, "XDS" (2010), Acta Cryst. D66, 125-132
+centred lattice, the recognition of shaded detector regions by comparing a pixel's background
+against the background at its own resolution (`DEFPIX`), and the scaling correction surfaces
+indexed by image number and detector region. W. Kabsch, "XDS" (2010), Acta Cryst. D66, 125-132
 [doi:10.1107/S0907444909047337](https://doi.org/10.1107/S0907444909047337); W. Kabsch, "Integration,
 scaling, space-group assignment and post-refinement" (2010), Acta Cryst. D66, 133-144
 [doi:10.1107/S0907444909047374](https://doi.org/10.1107/S0907444909047374).
@@ -209,6 +211,25 @@ K. Diederichs, "Linking crystallographic model and data quality" (2012), Science
 P. A. Karplus, "Better models by discarding data?" (2013), Acta Cryst. D69, 1215-1222
 [doi:10.1107/S0907444913001121](https://doi.org/10.1107/S0907444913001121).
 
+**The frame disposition** - which stretches of a rotation sweep are kept, carried at reduced weight or
+dropped from the merge - decides every exclusion on delta-CC1/2, the change in the overall CC1/2 when a
+group of images is left out, measured in the sigma-tau form so that no random half-dataset split is
+involved. The statistic, the Fisher transformation used to compare it across CC1/2 values, its standard
+error going as the inverse square root of the reflection count, and the rejection discipline (never
+remove a group whose delta-CC1/2 is positive or near zero; remove a little, re-form the reference and
+repeat) are all taken from its authors, whose XDSCC12 is the reference implementation.
+G. Assmann, W. Brehm and K. Diederichs, "Identification of rogue datasets in serial crystallography"
+(2016), J. Appl. Cryst. 49, 1021-1028
+[doi:10.1107/S1600576716005471](https://doi.org/10.1107/S1600576716005471); G. M. Assmann, M. Wang and
+K. Diederichs, "Making a difference in multi-data-set crystallography: simple and deterministic
+data-scaling/selection methods" (2020), Acta Cryst. D76, 636-652
+[doi:10.1107/S2059798320006348](https://doi.org/10.1107/S2059798320006348). That the same statistic
+belongs at scaling, applied to groups of images rather than to whole datasets, follows
+[DIALS](https://dials.github.io/) (`dials.scale`, delta-CC1/2 image-group filtering):
+J. Beilsten-Edmands, G. Winter, R. Gildea et al., "Scaling diffraction data in the DIALS software
+package: algorithms and new approaches for multi-crystal scaling" (2020), Acta Cryst. D76, 385-399
+[doi:10.1107/S2059798320003198](https://doi.org/10.1107/S2059798320003198).
+
 **Uncertainty conventions** follow the IUCr Commission on Crystallographic Nomenclature:
 D. Schwarzenbach, S. C. Abrahams, H. D. Flack et al., "Statistical descriptors in crystallography:
 Report of the IUCr Subcommittee on Statistical Descriptors" (1989), Acta Cryst. A45, 63-75
@@ -230,8 +251,9 @@ Elements Z = 1 to 92 and 48 Additional Substances of Dosimetric Interest" (1995,
 NIST Standard Reference Database 126
 [doi:10.18434/T4D01F](https://doi.org/10.18434/T4D01F).
 
-**Polarization correction** — the azimuthal polarization factor applied to both the azimuthally
-integrated profile and the integrated Bragg intensities is the one derived for a partially polarized
+**Polarization correction** — the azimuthal polarization factor applied to the azimuthally
+integrated profile, to the integrated Bragg intensities and to the ring background the beam-stop
+shadow test compares a pixel against is the one derived for a partially polarized
 synchrotron source by R. Kahn, R. Fourme, A. Gadet, J. Janin, C. Dumas and D. Andre, "Macromolecular
 crystallography with synchrotron radiation: photographic data collection and polarization
 correction" (1982), J. Appl. Cryst. 15, 330-337
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 2ea64e89d..a6b014a8a 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Changelog
 ## 1.0.0
 
+### 1.0.0-rc.169
+
+* Building Jungfraujoch no longer needs zlib or Eigen installed on the machine, and the dependencies the build fetches are pinned and updated to current releases.
+* rugnux: improvements in indexing, lattice selection and geometry post-refinement, which index crystals that previously returned no lattice and keep the better of the two geometries a run measures.
+* rugnux: improvements in beam-centre measurement, beam-stop detection and space-group determination.
+* rugnux: the unit cell reported with a determined space group now obeys that group - a cell whose symmetry was confirmed from the intensities is re-refined under it, and a cell the group cannot describe is reported with a warning rather than as it stands.
+* rugnux drops the stretches of a rotation sweep whose removal measurably improves the merged intensities and reports what became of every frame, and decides the resolution cut on the crystal's own diffraction rather than on its ice rings.
+* The rugnux results report is machine-readable - every line that is not `KEY= value` data starts with `#` - and states the build it was written by, its authorship and its terms of use (`REPORT_VERSION= 8`).
+* `jfjoch_viewer`: improvements in the file manager (CBF frames beside HDF5 datasets, a remembered root), the dataset plots, the inspector and the image statistics, plus a settable font size, a view of the rugnux results report, usable performance over a remote display (`ssh -X`) and a reset of all settings to defaults; the reciprocal-space window is removed.
+* Broker fixes around DECTRIS collections and dark-mask calibration: re-initialising after a run that never started no longer freezes the broker, a cancelled calibration is abandoned instead of reported as done, and a collection whose start message never arrives ends by itself.
+
 ### 1.0.0-rc.168
 
 * rugnux is substantially faster - a corpus of 145 rotation datasets processes in about two thirds of the time - with identical results.
diff --git a/docs/CPU_DATA_ANALYSIS.md b/docs/CPU_DATA_ANALYSIS.md
index 6d66d1dcf..16fedef2c 100644
--- a/docs/CPU_DATA_ANALYSIS.md
+++ b/docs/CPU_DATA_ANALYSIS.md
@@ -55,7 +55,7 @@ The methods draw on, and in places reimplement, solutions from:
 - M. Wojdyr, "GEMMI: A library for structural biology", *J. Open Source Softw.* **7** (2022), 4200 (model / structure-factor / map machinery used in §14).
 - J. P. Wright, "Experiences with GPU decompression for bitshuffle + LZ4 data", HDF5 User Group meeting (2021), and [github.com/jonwright/bslz4decoders](https://github.com/jonwright/bslz4decoders) (device-side decoding of bitshuffle+LZ4 images, §0).
 - A. Thorn & G. M. Sheldrick, "ANODE: anomalous and heavy-atom density calculation", *J. Appl. Cryst.* **44** (2011), 1285-1287 (anomalous difference density read at the model's sites).
-- R. Kahn, R. Fourme, A. Gadet, J. Janin, C. Dumas & D. Andre, "Macromolecular crystallography with synchrotron radiation: photographic data collection and polarization correction", *J. Appl. Cryst.* **15** (1982), 330-337 (the azimuthal polarization factor of §2.2, applied to both the azimuthal profile and the Bragg intensities).
+- R. Kahn, R. Fourme, A. Gadet, J. Janin, C. Dumas & D. Andre, "Macromolecular crystallography with synchrotron radiation: photographic data collection and polarization correction", *J. Appl. Cryst.* **15** (1982), 330-337 (the azimuthal polarization factor of §2.2, applied to the azimuthal profile, the Bragg intensities and the ring background the beam-stop shadow test compares against).
 - R. J. Read, "Improved Fourier coefficients for maps using phases from partial structures with errors", *Acta Cryst.* **A42** (1986), 140-149 (the sigma_A formalism and the m, D weighting of the map coefficients of §14.4).
 - A. Fokine & A. Urzhumtsev, "Flat bulk-solvent model: obtaining optimal parameters", *Acta Cryst.* **D58** (2002), 1387-1392 (the flat bulk-solvent model, its optimal parameters and the range they are physically meaningful over, used when scaling a model to the data in §14).
 - P. V. Afonine, R. W. Grosse-Kunstleve & P. D. Adams, "A robust bulk-solvent correction and anisotropic scaling procedure", *Acta Cryst.* **D61** (2005), 850-855 (the grid search over that range that fits k_sol and b_sol, with the overall scale and anisotropic B refitted at each grid point).
@@ -68,6 +68,7 @@ The methods draw on, and in places reimplement, solutions from:
 - K. Röttger, A. Endriss, J. Ihringer, S. Doyle & W. F. Kuhs, "Lattice constants and thermal expansion of H2O and D2O ice Ih between 10 and 265 K", *Acta Cryst.* **B50** (1994), 644-648 (the ice Ih cell the ring positions below 1.522 Å are calculated from).
 - S. Sheriff & W. A. Hendrickson, "Description of overall anisotropy in diffraction from macromolecular crystals", *Acta Cryst.* **A43** (1987), 118-121 (the overall anisotropic B tensor and its symmetry constraints), and A. N. Popov & G. P. Bourenkov, "Choice of data-collection parameters based on statistic modelling", *Acta Cryst.* **D59** (2003), 1145-1153 (the sigma-aware estimation of the anisotropy of the observed intensity distribution, part of that paper's statistic modelling).
 - P. R. Evans & G. N. Murshudov, "How good are my data and what is the resolution?", *Acta Cryst.* **D69** (2013), 1204-1214 (AIMLESS: the anisotropic deltaB as the range of the principal components, and diffraction limits from a cone about each principal direction).
+- G. Assmann, W. Brehm & K. Diederichs, "Identification of rogue datasets in serial crystallography", *J. Appl. Cryst.* **49** (2016), 1021-1028, and G. M. Assmann, M. Wang & K. Diederichs, *Acta Cryst.* **D76** (2020), 636-652 (XDSCC12: sigma-tau CC1/2, delta-CC1/2, the Fisher transformation and the rejection discipline the frame disposition follows).
 - K. Diederichs & P. A. Karplus, *Nat. Struct. Biol.* **4** (1997), 269-275, and P. A. Karplus & K. Diederichs, *Science* **336** (2012), 1030-1033 (R_meas / R_pim, CC1/2 and CC\*).
 - IUCr Commission on Crystallographic Nomenclature, "Statistical descriptors in crystallography", *Acta Cryst.* **A45** (1989), 63-75, and *Acta Cryst.* **A51** (1995), 565-569 (uncertainty conventions).
 
diff --git a/docs/CPU_DATA_ANALYSIS_DECISIONS.md b/docs/CPU_DATA_ANALYSIS_DECISIONS.md
index 8f853b584..c35a64250 100644
--- a/docs/CPU_DATA_ANALYSIS_DECISIONS.md
+++ b/docs/CPU_DATA_ANALYSIS_DECISIONS.md
@@ -12,10 +12,10 @@ Part of the [CPU/GPU data-analysis reference](CPU_DATA_ANALYSIS.md); the section
 
 ### 13.1 Space-group determination
 
-When no space group is supplied, a POINTLESS-like search scores Laue-group symmetry (CC of $E^2(h)$ vs $E^2(Rh)$ — the intensities normalised by the mean of their own resolution shell — plus merge self-consistency) and detects screw/centering absences from the $P1$-merged intensities. Three tests gate a promotion to higher symmetry, all aimed at the merohedral twin, whose twin law forces non-equivalent reflections together and so mimics symmetry:
+When no space group is supplied, a POINTLESS-like search scores Laue-group symmetry (CC of $E^2(h)$ vs $E^2(Rh)$ — the intensities normalised by the mean of their own resolution shell — plus merge self-consistency) and detects screw/centering absences from the $P1$-merged intensities. Three tests weigh a promotion to higher symmetry, all aimed at the merohedral twin, whose twin law forces non-equivalent reflections together and so mimics symmetry:
 
 1. **Merge self-consistency** ($\chi^2$ under the candidate group, relative to the confirmed subgroup). On its own this is not sufficient: it is a ratio to an error model that moves with the *amount* of data — the parent's systematic term grows as $\sigma$ shrinks with $1/\sqrt{N}$, while a twin's is already saturated — so its verdict depends on how much data the search saw.
-2. **Error-model $b$** (the intensity-proportional systematic). A genuine symmetry step gains multiplicity without inflating $b$; merging a twin law's extra operator inflates it. A $\chi^2$-passing promotion is vetoed when $b$ rises past a bound relative to the confirmed subgroup.
+2. **Error-model $b$** (the intensity-proportional systematic). A genuine symmetry step gains multiplicity without inflating $b$; merging a twin law's extra operator inflates it. This is a **rescue and never a veto**: a $\chi^2$-borderline promotion whose $b$ stays close to the confirmed subgroup's is confirmed on it, which is what recovers a genuine high-symmetry group on imperfectly-scaled data, but it cannot demote a promotion that passed. The veto it once carried was removed. It was guarded by "$H$ could not be computed", so it could only ever act where the one statistic that discriminates here is blind, and what it compared there was not a measurement but the error-model bisection's own ceiling — which made a space group depend on the compiler flags, the same source refusing a correct $P2_12_12_1$ in one build and not in the other. No bound repairs it: genuine promotions have since been measured up to 5.8 where the bound was calibrated at 1.62 against a twin at 2.1, so the two populations have swapped sides. The case it was meant to catch — a merohedral twin too sparse for $H$ — is answered below it by the added-operator $R$ gate, whose reference is the global best rather than the parent.
 3. **Operator disagreement**, a sigma-free statistic $H=\mathrm{median}\,|I_1-I_2|/(I_1+I_2)$, formed as the ratio of the operators a promotion *adds* to the parent's own, measured on the same reflections. Normalising against the parent divides out the systematic floor that symmetry mates carry on real data, which varies by crystal and by operator; a median is used because a twin perturbs every pair whereas a badly-measured minority perturbs only the tail. Where a candidate has several parents of the same order, it is judged against the worst of them, since a rival subgroup can itself contain the twin laws.
 
 The correlation is on **resolution-normalised** intensity $E^2 = I/\langle I\rangle(\text{shell})$, normalised over exactly the reflections the correlation pairs. Both members of a symmetry pair lie at the same $|s|$, so on raw $I$ the resolution fall-off is variance shared perfectly between the two arms and appears as a positive correlation for *any* pairing at all: a shell-matched random pairing — the exact null for a metrically-allowed false operator — scores a median 0.31 across the rotation battery, and on one crystal 0.53 — above the bound the correlation is tested against. That floor varies more from crystal to crystal (spread 0.46) than the whole true/false gap is wide (0.38), so an absolute bound on the raw statistic is a different test on every crystal; and it moves with the search resolution cut, which is what made that cut a symmetry-deciding parameter. Normalised, the floor has a median of 0.015, never exceeds 0.06, and barely moves with the cut.
@@ -46,13 +46,15 @@ Both search merges also drop the **frames whose fitted per-frame scale came out
 
 **Centering** is accepted when the systematically-absent class is weak relative to the present one by *either* of two floor-independent tests: its mean signed $I/\sigma$ well below the present mean, *or* its rate of individually-significant reflections well below the present class's own significant rate. The second test covers weak and low-energy data, where a positive intensity floor (background and profile leakage) lifts the absent class's mean $I/\sigma$ well above zero and, when the present class is itself weak, carries the plain mean ratio past its bound; a false centering fails both tests, its absent class being as strong as the present one. When several centerings pass they are ranked by a **Beta-tail likelihood** rather than by a count of net absences: a count lets a centering that extinguishes many more reflections out-rank one that violates far fewer, and the likelihood weighs the violations against the class each belongs to instead. The acceptance bounds above are unchanged by that ranking.
 
+**A confirmed promotion that is refused is decided by merging under it.** Every gate that refuses a *confirmed* higher point group is a **ratio** — the added operators' disagreement against the parent's, or their $R$ against the best-agreeing operator anywhere — and both references are properties of how the crystal was mounted rather than of its symmetry. A 2-fold within a degree of the spindle records its mates on the same detector pixel half a turn later, so it carries no geometry-dependent systematic at all, and by being that clean it makes every other operator look bad against it; the best-agreeing operator can also be one of the operators under test, which collapses the ratio on worse data and raises it on better. So where a promotion is confirmed and then refused, the **merge** is asked instead of the ratio. Both groups are scaled and merged over one pinned resolution range — the adopted group's own cut — and the promotion is taken only if **neither $R_\mathrm{meas}$ nor ISa gets worse**. $R_\mathrm{meas}$ is multiplicity-corrected, so folding non-equivalent reflections together has to inflate it, and the error model is refitted per merge, so ISa says whether the extra multiplicity was bought with systematic disagreement. $CC_{1/2}$ and $\langle I/\sigma\rangle$ cannot arbitrate this: both *rise* on a false promotion too. Two details the comparison turns on: the refused point group's representative is primitive and symmorphic, so the arm merged under it takes the **adopted group's centring** — merged in the bare representative, a centred crystal is handed its centring-absent class as data, which inverts the decision — and the absence stage is asked of the adopted merge, so both arms carry the same absence classes and differ by the added rotations alone. The cost is two extra merges, and only on a run that records a refusal, which is a few in a hundred.
+
 **The lattice class is re-asked where the metric knows more.** The Bravais class comes from Niggli reduction and a lattice-character lookup (§6), and that lookup can land short of the truth or beside it: near the Niggli type-I/type-II boundary it is decided by the last digits of the refined cell, and a lattice that is nearly but not exactly hexagonal matches the hexagonal character even when no point group that class can host carries the two-folds the data actually have. Two recoveries run, both settled by the intensities. Every rotation the cell metric can host beyond the named class — read off Le Page's two-fold search on the lattice itself, which measures each rotation's obliquity in a primitive basis and owes nothing to the character table — is put to the intensities as a single operator, scored exactly as the search scores its own operators, on the same reflection population and the same $E^2$ normalisation. And where the metric group is larger than the adopted class's holohedry, the merge is reindexed into the metric group's conventional cell and the space-group search is run again there, with every gate live; the reindex is committed only where the search in the new setting confirms a strictly higher point group *and* the centring the new cell describes, so a pseudo-symmetric metric leaves the answer already in hand standing.
 
 ### 13.2 Twinning check, and translational pseudo-symmetry
 
 A Padilla–Yeates $L$-test ($\langle|L|\rangle$, $\langle L^2\rangle$ — 0.500 and 0.333 untwinned, 0.375 and 0.200 for a perfect twin) and the second moment $\langle I^2\rangle/\langle I\rangle^2$ (2.0 for untwinned acentric data, 1.5 for a perfect twin; taken per resolution shell with noise-only shells skipped and Wilson outliers rejected, so a single strong reflection in a collapsed-mean shell cannot skew it) are written to the merged mmCIF as a twinning diagnostic. A merohedral twin law exists only where the Laue class is a proper subgroup of the lattice holohedry, so in the high-symmetry holohedral classes ($4/mmm$, $6/mmm$, $m\bar{3}m$, and $\bar{3}m$ on a rhombohedral lattice) twinning is never flagged, and a low $\langle|L|\rangle$ there is reported as a statistical artefact instead. The low-symmetry holohedral classes ($\bar{1}$, $2/m$, $mmm$) also admit no strictly merohedral law, but they stay eligible for the flag on purpose: *pseudo*-merohedral twinning through an accidentally special metric cannot be ruled out from the symmetry alone, and those are the classes it happens in.
 
-**Translational pseudo-symmetry** — two copies of the contents of the asymmetric unit related by a pure translation that is not a lattice vector — is looked for on every merging run, because it is the classic predictor of a failed molecular replacement, and because it raises the second moment where twinning lowers it, so each can mask the other's test. The detection is the native-Patterson route of Read, Adams & McCoy (see the [references](CPU_DATA_ANALYSIS.md#references)): the largest off-origin peak of a Patterson computed from the merged intensities, as a fraction of the origin peak, with the peak vector then refined against the intensity modulation it should produce — the ratio of the strongest to the weakest bin mean of $\langle E^2\rangle$ over the phase $\mathrm{frac}(\mathbf{h}\cdot\mathbf{u})$. Both halves are scored against a null computed for the crystal at hand rather than against a fixed bound — the peak against the same map with the intensities permuted within resolution shells, the modulation against the same search started from random vectors — because the noise floor of the peak statistic spans an order of magnitude across data sets, so no fixed percentage means the same thing twice. Requiring both halves is what keeps the false-positive rate down; either alone over-calls by about a factor of two. A translation the merged data are **exactly** invariant under is reported as an undeclared lattice translation instead — a translation the data are exactly invariant under is a lattice vector by definition, so the centring or the cell is wrong, not the packing — and the pseudo-symmetry search continues underneath it, so a real pseudo-translation sitting under an undeclared centring is still found. The finding itself is report-only (the `TNCS_*` keys of `<prefix>_report.txt`): it gates nothing and changes no reflection, no scale and no group — but the axial-absence test (§13.1) and the $L$-test here both correct themselves against the modulation it measures.
+**Translational pseudo-symmetry** — two copies of the contents of the asymmetric unit related by a pure translation that is not a lattice vector — is looked for on every merging run, because it is the classic predictor of a failed molecular replacement, and because it raises the second moment where twinning lowers it, so each can mask the other's test. The detection is the native-Patterson route of Read, Adams & McCoy (see the [references](CPU_DATA_ANALYSIS.md#references)): the largest off-origin peak of a Patterson computed from the merged intensities, as a fraction of the origin peak, with the peak vector then refined against the intensity modulation it should produce — the ratio of the strongest to the weakest bin mean of $\langle E^2\rangle$ over the phase $\mathrm{frac}(\mathbf{h}\cdot\mathbf{u})$. Both halves are scored against a null computed for the crystal at hand rather than against a fixed bound — both against the same intensities **permuted within resolution shells** — the peak against that map, the modulation against the same measurement made on the shuffled intensities and started where the measurement starts — because the noise floor of the peak statistic spans an order of magnitude across data sets, so no fixed percentage means the same thing twice. The shuffle leaves the reflection count, the $E^2$ distribution and the phase-bin populations untouched and removes only the correlation between a reflection's intensity and $\mathbf{h}\cdot\mathbf{u}$, which is the thing the modulation claims to see. Re-running the greedy search from random starting vectors over the *same* intensities does not work as a control: a greedy search started anywhere walks into a real modulation's basin, so it measures the search **and** whatever modulation the crystal carries — measured over 110 merged datasets, single draws of that control reached 199× and 6162× on crystals whose own modulation reads 4.0× and 67×, and on 28 of the 110 it came out at or above the signal it is subtracted from. Requiring both halves is what keeps the false-positive rate down; either alone over-calls by about a factor of two. A translation the merged data are **exactly** invariant under is reported as an undeclared lattice translation instead — a translation the data are exactly invariant under is a lattice vector by definition, so the centring or the cell is wrong, not the packing — and the pseudo-symmetry search continues underneath it, so a real pseudo-translation sitting under an undeclared centring is still found. The finding itself is report-only (the `TNCS_*` keys of `<prefix>_report.txt`): it gates nothing and changes no reflection, no scale and no group — but the axial-absence test (§13.1) and the $L$-test here both correct themselves against the modulation it measures.
 
 **The $L$-test partners are chosen so a pseudo-translation cannot silence it.** The test compares each reflection with a partner a fixed index step away, and a pseudo-translation biases $\langle|L|\rangle$ upwards unless the partner shares its modulation class. The ordinary step of 2 preserves the class of a half-integer translation — the pseudo-centering the statistic's authors call it robust to — but not of one of a third, which inflates $\langle|L|\rangle$ past the bound that is read as evidence *against* twinning and silently loses the twin call on a crystal that has one. Where a pseudo-translation is detected, the partner steps are restricted to those that preserve its class; where no step does, the statistic is dropped from the twin verdict **in both directions** — it can no longer indicate a twin and can no longer be read as proof that there is none — and the second moment decides alone. `L_TEST_VS_TNCS=` in the report says which of the three happened.
 
@@ -63,6 +65,10 @@ Merging applies an optional per-observation median-based $N\sigma$ cut (`--rejec
 
 By default the reported/written high-resolution limit is trimmed where $\mathrm{CC}_{1/2}$ falls off: a logistic is fitted to $\mathrm{CC}_{1/2}(s)$, and the limit is set **one reported-shell width past** the point where the fit crosses 0.30 — deliberately "one shell too far", so weak-but-real data below the crossing are kept rather than discarded. The extension is measured over the range that is actually kept, not the full measured range, so a detector reaching far past where the crystal diffracts cannot inflate it. `--scaling-high-resolution` overrides the limit and `--resolution-cutoff off` disables it.
 
+**Ice sits out of this fit, and only this fit.** A powder ring is reproducible: past the crystal's own limit the ice is still there and still the same in both half-sets, so the two halves agree *about the ring*, and a Pearson $\mathrm{CC}_{1/2}$ cannot tell that agreement from diffraction. Shells have been measured at $\mathrm{CC}_{1/2}=0.765$ where $\langle I/\sigma\rangle$ is $-0.1$ and $R_\mathrm{meas}$ is 470 %, inside the written range because the logistic was fitted through them; against archived references, runs whose frames carry ice were written a mean twelve per cent finer than the reference where runs without ice were written four, and every over-claim past twenty per cent has rings. The same ring drags the curve the other way where the data are good — one shell of forty falling to 0.51 because the two strongest ice lines cross it, with the shells either side at 0.99 — which is a real defect of those reflections but narrower than the shell it defames. Both signs are the same cause and both leave the fit: the reflections flagged in §3.3 are still merged, still written and still counted in the shell table (§10.10), and what changes is only that the resolution **decision** now reads the same curve that scaling, the error model and the space-group search already read.
+
+**A cut the shell table refutes is not quoted.** Two things keep the number inside what the bins show. The fitted crossing has to lie **inside the fitted bins**: on a real fall-off it sits between the last bin at the target and the first bin below it, with the extension bins to spare, and a crossing past the last fitted bin is an extrapolation of a fall-off these data never showed — the crossing is then read off the bins themselves, between the two that straddle the target. And no single resolution is quoted at all where the curve is not a fall-off: where $\mathrm{CC}_{1/2}$ never reaches the target in any shell, where the fit reads finer than the finest shell whose $\mathrm{CC}_{1/2}$ still reaches it, or where $\mathrm{CC}_{1/2}$ **climbs back over the target** after falling below it — a noise shell that climbs back is not the edge of the data. The report then says which of the three happened and points at the shell table instead.
+
 ### 13.5 Diffraction anisotropy
 
 How fast the intensity falls off with resolution can depend on direction. rugnux measures that, reports it, and does nothing else with it: no intensity is corrected, no reflection is removed on a directional criterion, and the merged data and the written files do not depend on direction at all.
diff --git a/docs/CPU_DATA_ANALYSIS_IMAGE.md b/docs/CPU_DATA_ANALYSIS_IMAGE.md
index 2a6a6ca6f..ba18e73e4 100644
--- a/docs/CPU_DATA_ANALYSIS_IMAGE.md
+++ b/docs/CPU_DATA_ANALYSIS_IMAGE.md
@@ -135,17 +135,46 @@ indexing.
 **Measured on every run (`--beam-center-check`, on by default).** The isotropy of the scattered
 background places the centre — the leverage is the curvature of the solvent ring — and the mean
 image the beam-stop pre-scan already builds is the array the fit runs over, so the measurement costs
-no frames of its own. The run reports what the file claims, what the background says, how well the
+no frames of its own — and, for the same reason, `--detect-beam-stop=off` leaves nothing to measure
+it on, projecting every frame for this alone being the largest per-frame cost of the pre-scan. The run reports what the file claims, what the background says, how well the
 fit knows its own answer, and how far this particular geometry can afford to be wrong: the smearing
 of the accumulated reciprocal-space cloud by a centre error $\delta p$ multiplies the FFT amplitude
 at an axis of length $a$ by $J_0(2\pi\,\delta p\,a/(D\lambda))$, and past the first zero the true
 axis is gone and its harmonic wins. That tolerance runs from well under one pixel to several, so a
-flat pixel bound means different things on different geometries.
+flat pixel bound means different things on different geometries. The comparison is against the
+**direct beam**, not the PONI: `beam_x_pxl` is the point of normal incidence, and the two part by
+$D\tan(\mathrm{rot})/p$ the moment the detector is tilted — several pixels on an ordinary tilt, which
+is several times the agreement the check asks for. Both measurements below are of where the beam
+*lands*, because the centrosymmetry of the scattered background is about that point.
+
+**Whole-detector capture, then a local walk.** The fit above is local: it steps toward the centre from
+where it starts, so a header a few hundred pixels out is beyond its reach. The reach comes from a
+transform instead. The centrosymmetry score of the projection about a candidate centre $\mathbf{c}$,
+$\sum_\mathbf{x} I(\mathbf{x})\,I(2\mathbf{c}-\mathbf{x})$, is the self-convolution $(I*I)(2\mathbf{c})$,
+so **one FFT pair scores every candidate centre on the detector** at half-pixel spacing: the cost is
+$O(N\log N)$ and independent of how far the header is from the truth, where every search that steps
+pays per pixel of error. Three surfaces are scored — the 2D point inversion, which measures the same
+isotropic background the walk fits, and a 1D line mirror per detector axis, which along the spindle is
+exact Friedel physics (a reflection's mate half a turn later lands mirrored in the line through the
+beam across the spindle) and is therefore sharp in exactly the direction the indexed-frame count is
+blind to. The beam-stop shadow is blanked out of the scored image, a one-sided opaque obstruction
+being a centrosymmetry defect in its own right. What comes back is a **shortlist and a margin per
+surface, never a centre**: measured on 17 datasets the surface can be locally flat over tens of
+pixels, and the peak-to-runner-up margin is what says so. The walk is then seeded at the capture and
+refines it; where the walk declines there it is asked again from the file's centre, and only where
+neither start gives it something to fit does the capture stand alone, at the precision of a capture
+rather than of a fit. The transforms run on the GPU where one is present with room for the image and
+on FFTW otherwise — everything that decides anything is shared between the two engines, so they can
+differ only in how the convolutions are computed.
 
 Nothing is committed on the strength of it. The rotation first pass is simply run **a second time**
-at the measured centre — the spots are cached and do not depend on the centre, so this costs a
-fraction of the first pass — and the two lattices are compared. The measured centre is adopted only
-where the file's centre indexes nothing and the measured one indexes a majority; where both work and
+at the measured centre and the two lattices are compared. Raw centroids do not move with the beam
+centre, but *which spots are in the list* does — the resolution limit, the ice-ring flag, the
+beam-stop mask and the strongest-$N$ ranking are all computed against a radius — so a trial centre is
+given its own azimuthal mapping, spot engines and spot cache, and the starting centre's cache is
+parked and restored, so a trial that adopts nothing leaves the run exactly as it was. The measured
+centre is adopted only where the file's centre indexes nothing and the measured one indexes a
+majority; where both work and
 disagree, both cells are reported and neither is chosen, because the only arbiter available at that
 stage is the indexed frame count and **it points the wrong way**: acceptance is a fractional-Miller
 test, so a cell twice as long must place every spot twice as accurately to score the same, and a
@@ -153,9 +182,20 @@ halved axis can index *more* frames than the true cell. Where the two disagree o
 at the same primitive volume, that is said separately from a volume ratio that is an axis harmonic,
 which is the one the centre decides.
 
+Two things keep that comparison honest. The **depth** of the spot list is asked at *both* centres: the
+first-pass ladder of §6 reads how much of each frame the pass uses, and a count taken at the measured
+centre against the whole spot list at the file's differs in two things at once, so it cannot say which
+of them the gain came from. Running the ladder at both centres makes the centre move only when it is
+the centre that pays; an exact tie keeps the file's, and where the file's centre wins the run takes
+that rung and says the depth, not the centre, was the problem. And a rung whose primitive volume is an
+integer or $\sqrt{3}$ multiple of the standing cell's is **refused** — a longer cell indexes more, the
+same harmonic bias §6 guards its own hypotheses against.
+
 Two further things are said before a frame is read, both free: a centre that lands on a masked pixel
-is wrong about something, and a beam-stop pre-scan that finds **exactly zero** shadowed pixels is not
-a beamline without a beam stop but a centre far enough out that every flood seed fell in a gap.
+is wrong about something, and a beam-stop pre-scan that finds **exactly zero** shadowed pixels is a
+statement about the comparison as much as about the beamline — the shadow is found by comparing each
+pixel with its own radius ring (§1.5), so an unexpected answer is read against the centre those rings
+were drawn about before it is read as hardware.
 
 **Two discrete rescues after a first pass that failed.** A rotation sweep leaves two things the input
 often cannot settle, both decidable from the data on the same count the rest of the first pass uses —
@@ -224,8 +264,7 @@ Where neither method can measure the centre, the value from the file is kept.
 The beam stop and its holder arm shadow part of the detector. A reflection behind them is attenuated
 but otherwise ordinary — it integrates low, with a plausible $\sigma$, and no outlier test catches
 it — so the shadow is found and masked instead. `--detect-beam-stop[=N|off]` (on by default, $N=60$
-frames; it reads its own frames, so it is not affected by, and does not affect, the beam-centre
-pre-scan of §1.4) projects those frames to a per-pixel mean and maximum, and writes the result into
+frames) projects those frames to a per-pixel mean and maximum, and writes the result into
 the pixel mask as bit 9, from where it excludes those pixels from every later stage.
 
 The shadow is a place where the background is *missing*, so it is found by comparing each pixel's
@@ -233,15 +272,64 @@ background against the background at the same radius. The mean is pooled over a
 a single pixel of a sparse background carries too few counts to tell a shadow from a Poisson hole,
 and the stop is much wider than the box — and the comparison is against the median of the pixel's own
 radius ring, taken over the pixels not already excluded and iterated a few times so the shadow stays
-out of the baseline it is measured against. A pixel is shadow when the ratio falls below 0.35, and
-only where the ring has accumulated enough counts for the dip to mean anything. Nothing assumes the
-stop and the beam are concentric, because only the per-ring comparison is used; a ring lying wholly
-inside the stop has no unshadowed pixel for its median to find, which is exactly the case where the
-comparison must fail, and such a ring is shadow in its entirety.
+out of the baseline it is measured against. A pixel is shadow when the ratio falls below 0.50 **and**
+the deficit is significant against its own Poisson scatter, $\sqrt{2\,(E-N+N\ln(N/E))}$ over the pooled
+counts. A ratio says nothing when the background behind it is a handful of photons, and it is that
+significance that makes the comparison scale-free rather than tuned to one exposure: rebuilt from six
+frames of a low-background sweep, the same ratio without it masks three quarters of the detector. The
+index of dispersion does *not* do this job — it is 1.0 inside the shadow and 1.0 outside it, a
+shadowed pixel being Poisson at a low rate and a lit one Poisson at a high rate — only the rate
+relative to the ring separates them.
 
-What survives is then shaped into a region: the low pixels connected to the beam centre, bridged
-across the module gaps the holder arm crosses, grown outward through the partially shadowed penumbra,
-closed, and with the interior of the disk filled. Last, any pixel that ever recorded a real
+Nothing assumes the stop and the beam are concentric, because only the per-ring comparison is used; a
+ring lying wholly inside the stop has no unshadowed pixel for its median to find, which is exactly the
+case where the comparison must fail. Such a ring is judged against what this detector's background
+typically is — the median over the rings the walk is willing to judge — and is shadow in its entirety
+when it falls far below that. Comparing it instead against the *largest* background further out reads
+an ordinary background inside a strong ring as blocked, and the walk then runs out to that ring and
+returns a filled disk of good detector with diffraction rings plainly visible inside it.
+
+**The rings are drawn about the centre the data measure, not the one the file claims.** Displacing the
+centre costs nothing for tens of pixels and a great deal beyond: at 150 px out the comparison describes
+the background's own radial fall-off rather than the hardware, and returns a tenth of the detector as
+shadow with nothing blocking it — and header centres are wrong by that much. The centre is therefore
+fitted from the same per-pixel mean the mask is computed from, before the mask is read, and named to
+the finder; it costs no frame of its own. That first fit is itself biased by the shadow it has not yet
+masked (on a sweep with a third of the detector behind a pin it landed 5 px out and called itself
+0.40 px), and it does not have to be unbiased: the ring comparison does not notice tens of pixels, and
+the centre the run *reports and consumes* is the second fit of §1.4, the one that runs after the mask
+is loaded with the shadow out of the way. The order is fit, mask, fit, and only the second answer
+leaves. Two rounds are enough, measured rather than assumed — on clean sweeps the two fits agree to
+0.03 px, so a third would draw the same rings.
+
+**A ring is only flat once the polarization is divided out.** The comparison assumes the background is
+flat around a ring with nothing in the beam, and it is not: a polarized source suppresses the
+background in its own plane by the azimuthal factor of §2.2, a factor of three at $2\theta=55°$ and
+four at $70°$ — several times the dip the test is looking for, so on a short-distance geometry the two
+in-plane lobes of every outer ring read as shadow (measured: 5 % and 11 % of two detectors, with
+nothing visible under either mask). The mean projection is therefore divided by that factor before the
+ring comparison, and the Poisson deficit multiplies it back in so the significance is still the
+significance of the counts that were recorded. The factor is the geometry's own, evaluated about the
+centre just fitted rather than the one in the file: polarization is the only correction a ring carries
+that varies *along* it — solid angle, detector response and air absorption are functions of $2\theta$
+and the ring median absorbs them — and the geometry is what knows where the polarization plane lies
+once the detector is tilted, the stored image quarter-turned or the detector rotated in its own plane.
+
+What survives is then shaped into a region, and what makes it specific is **size**, not connection to
+the beam. A shadow is cast by something physical and is correspondingly large, while the background
+wanders a pixel or two at a time, so the connected components holding at least 2000 core pixels are
+kept and the rest dropped; measured on clean sweeps spanning 0.05 to 9.5 counts/px/frame of
+background, every one returns exactly one such component — the beam stop — and the largest spurious
+candidate anywhere is 74 pixels. Requiring the region to touch the direct beam instead is written for
+the stop and its holder arm; hardware standing in the beam further out — a pin, a loop — casts a
+shadow that begins some way out in radius, with lit detector between it and the stop and no bridge
+across the gap, and on one sweep that discarded 950 k correctly-found pixels and sent them into
+integration as measured-and-near-zero. The kept components are bridged across the module gaps the
+holder arm crosses, grown outward through the partially shadowed penumbra — much wider for a pin than
+for a stop edge — closed, and with the interior of the disk filled; the rings found lying wholly
+inside the stop join the region after the size filter rather than being asked to be large themselves.
+
+Last, any pixel that ever recorded a real
 reflection — a maximum over the frames well above background, in a cluster, so that a single-frame
 zinger does not count — is given back, because a beam stop cannot have blocked a reflection that was
 measured.
@@ -382,6 +470,18 @@ The eight bands below it are **calculated**, since past that paper there is noth
 
 One consequence is worth stating: the profile score is the **strongest** ring's ratio, a maximum over the bands, so a longer list can only raise it. The gate at 1.5 is therefore read against a list of this length, and lengthening it again would need the gate re-checked.
 
+**Rings this sample actually shows.** Hexagonal ice is the only phase whose rings can be named in
+advance, and it is not the only thing that powders: a shower of microcrystals around the crystal, or a
+salt out of the cryoprotectant, leaves the same textured rings at $d$-spacings no fixed list carries,
+and their spots are otherwise handed to the indexer as if they were this crystal's. The rings are
+therefore also **measured from the run's own pre-scan spots** — read off as what stands above the
+smooth fall-off of spot density with $q$ — on every run, and reported whether or not anything acted on
+them (`POWDER_*` in the results report: the ring count, the fraction of the pre-scan's spots they
+hold, and their $d$-spacings). The two lists are not the same list: on one such crystal 16 of the 24
+measured rings were ice and the rest were not. A measured ring is set aside from indexing only where a
+first pass that found no lattice needs it set aside (§6); the fixed ice bands above are what the ice
+score, the scale fit and the resolution cut read.
+
 A further optional safeguard removes isolated high-resolution “spur” spots by detecting large gaps in $1/d$ (or $q$) space and discarding spots beyond the gap. This is intended for macromolecular diffraction where edge-of-detector backgrounds can be extremely low.
 
 ### 3.4 Connected-component labeling (CCL)
diff --git a/docs/CPU_DATA_ANALYSIS_INDEXING.md b/docs/CPU_DATA_ANALYSIS_INDEXING.md
index 941817d99..807951ef1 100644
--- a/docs/CPU_DATA_ANALYSIS_INDEXING.md
+++ b/docs/CPU_DATA_ANALYSIS_INDEXING.md
@@ -41,6 +41,8 @@ For indexed spots, the reciprocal lattice point $\mathbf{p} = h\mathbf{a}^*+k\ma
 
 A frame is taken to be this crystal's when at least a fraction $g = 0.20$ of its in-resolution, non-ice spots index. On rotation data that decision is what admits the frame to integration, so its denominator matters: every spot handed to it that is not a reflection of this crystal argues against the frame.
 
+That test decides a **frame**. Whether a rotation run has a lattice **at all** is decided on the spots instead. A frame count comes from serial crystallography, where each image is its own experiment; a rotation sweep is one crystal and one orientation matrix, its frames are not independent of each other, and what such a count mostly measures is how many spots happen to land on a frame — a sweep carrying four spots an image cannot reach a six-spot bar on three frames in four however right the lattice is. The refusal therefore compares the fraction of *all* spots in the sampled frames that the lattice explains against what the same lattice explains when each frame's spots are put at **another frame's angle**: same lattice, same spots, same detector, same refinement, with only the claim that these spots were seen at *these* angles removed. That difference is the evidence, and it carries no spots-per-frame number anywhere, so nothing has to be chosen for a crystal that diffracts weakly. Measured over a hundred datasets the permuted level never exceeds 2.6 % and the smallest true margin is seventeen points. `--min-indexed-spots` (default 6, floor 4 — four is where a lattice stops being fitted by any three spots) still sets the reported indexing rate and the count the first pass *ranks* candidate lattices by; every rescue and every arbiter still counts frames.
+
 ### 4.2 The spot budget
 
 Only the strongest `--max-spots` spots of an image are kept (`FilterSpotsByCount`), and that budget therefore sets the denominator above. Detections are not all reflections — background structure, unlisted ice and detector artefacts are found too — so a budget deeper than an image's reflections makes the test above a measurement of the background rather than of the crystal, and a *larger* budget can integrate *fewer* images.
@@ -228,6 +230,26 @@ also runs (rotation only, and not when a cell was given — `-C` already lowers
 and its answer is adopted only when it is an integer sub-cell of the standing one and ties or beats
 it on the validation frames. Everywhere else the standard pass's answer stands.
 
+**A first pass that ends with no usable lattice tries a leaner, shallower one.** A crystal sitting in
+a crystalline powder floods the pass with spots that are not its own — measured, 2112 spots a frame
+against the 80 a clean crystal on the same beamline gives — and the FFT then takes its cell out of the
+powder shells. So the pass is retried over **how much of each frame it reads**: the strongest 30, 80,
+200 or all spots an image, each at the file's resolution and at the resolutions a quarter and a half
+of this sample's own spots lie coarser than, with the rings measured in §3.3 set aside where there are
+any. The rungs are decided late, on the validation-frame count — the way the rotation-axis sign
+already is — and one is adopted only on a win of a sixth of the frames. The same ladder is asked
+inside the beam-centre check of §1.4, where a centre that is wrong and a spot list that is too deep
+otherwise hide each other.
+
+The frame count cannot arbitrate an axis harmonic, though: a cell twice as long must place every spot
+twice as accurately to score the same, and across rungs the bias compounds, since the leanest and
+shallowest rung is both the one a halved axis scores best on and the one a smaller cell is easiest on.
+The winning rung is therefore put through the same harmonic arbiter as the hypotheses above — which of
+two cells accounts for more of the validation frames' spots — against every rung that cleared the bar
+and whose primitive volume is a near-integer multiple of the winner's. A winner that loses that
+question is a sub-multiple, and the ladder then adopts nothing rather than promoting the rival, which
+on the crystal this was measured on is a multiple of the true axis in its own right.
+
 **Note.** In ambiguous or special cases, forcing space group to $P1$ (no symmetry assumptions) is recommended.
 
 ---
@@ -283,6 +305,10 @@ Refinement is performed in stages with decreasing acceptance tolerance for inclu
 
 The loose first stage necessarily admits some spots that are not reflections of this lattice — the fraction of *randomly* placed spots inside a fractional-Miller tolerance $t$ is $\tfrac{4}{3}\pi t^3$, i.e. 11 % at $t=0.3$ — and an unweighted fit lets them pull the orientation. Each residual is therefore weighted by how strong its spot is **for its resolution**: the frame's spots are cut into equal-count resolution shells and each intensity is divided by its shell median, mapped to $w^2=r/(1+r)$. The shell normalisation is what makes this safe — genuine high-resolution spots are legitimately weaker and carry the cell and distance information, so an un-normalised intensity weight would suppress exactly the spots the fit needs. The weight is a property of the spot and never of the current residual, so it does not depend on how far the geometry is from convergence.
 
+**The rotation chain commits its best round, not the round it stops on.** After the winning candidate is selected, the refinement is run again — solve, re-accumulate the reciprocal-space cloud under the refined geometry, solve again — up to twenty times, and the loop stops on a test of the detector-tilt step. The chain is a trajectory and its last point is not always its best one: every solve ends by fitting only the spots inside its **tightest** gate, so a cell with a direction the data barely constrain (which is what a free cell whose metric is near a Bravais class has) can slide along it, pulling a core of spots tighter while the periphery falls out of the fit altogether. Measured on such a chain, the spots inside the tight gate rise over seventeen rounds while the spots inside the widest gate peak at round three and fall away — and round three is the round that merges at ISa 11.0 against 6.3 and $R_\mathrm{meas}$ 0.148 against 0.213. Nothing the run consulted could see it: indexed fraction, validation frames, validation spots and the tight-gate count all prefer the overfitted end.
+
+So every round is scored on the **widest** gate — the population the first pass selects on and the last pass does not fit, which makes it the one a converged solve is not optimising — and the best-scoring round is committed. Two conditions keep that from acting on noise. The score is a *count* of spots, so a lead of fewer than $\sqrt{\text{count}}$ of them leaves the last round standing. And the round taken has to be the less distorted lattice as well as the better-fitting one: the lattice search (§6) is re-asked every round to **measure** how far the cell sits from the ideal metric of the class it matches (imposing that class is measured fatal — the snap puts almost everything outside the refinement's own gate), and an earlier round is taken only when it matched the *same* class and sits closer to it. Same class is a precondition and not a precaution: the deviation is a fraction of whichever class's tolerance admitted it, so two classes' deviations are not the same quantity, and a round that matched no class reports zero, which means "nothing was asserted" rather than "undistorted". A chain that has settled scores its rounds within a spot or two of each other and a symmetry-constrained solve holds its distortion at zero throughout, so the rule fires on neither: measured over 914 chains, an earlier round scores higher on 44 % of them and the committed round changes on 1 dataset in 54.
+
 ### 7.5 Rotation geometry post-refinement (two-pass)
 
 The refinement above (§7.2) runs per image against that image's spots. For rotation data an additional **post-refinement** (on by default; `--rotation-no-postrefine` disables it) improves the detector distance, beam centre and crystal cell/axis using **all** frames at once, then re-integrates:
@@ -294,10 +320,14 @@ The refinement above (§7.2) runs per image against that image's spots. For rota
 
    Free: the crystal orientation, the unit cell (every parameter the crystal system leaves free, not one overall scale), the goniometer-axis direction, the detector distance and the beam centre. The positional residual on its own *is* degenerate with the cell scale — that is why this used to be split into a cell-scale step and a distance step — but the excitation residual does not involve the detector at all, so it fixes the absolute size of the reciprocal lattice and breaks the degeneracy inside the same problem. Splitting it instead cost accuracy twice over: pass 1 frees the whole lattice against a frozen distance, so the distortion it absorbs is *anisotropic* and no single scale can undo it; and whatever bias is left in that scale goes straight into the distance, which is only ever determined relative to the cell.
 
-   The fit is **cross-validated** on a deterministic split of the *reflections* (an avalanche-mixed $hkl$ hash, not a frame split and not an $h+k+l$ parity, which would collide with a centering condition and leave the held-out half empty): fitted on one half, committed only if it lowers the held-out residual — both families of it, since the excitation residual is the only evidence of the cell scale and the positional values outnumber it about three to one — and the move stays small: distance within 1 %, every cell length within 1 %, every free cell angle within 1°, beam centre within 15 px of the nearest centre anything already believes. The geometry the run commits is re-fitted on all the reflections once the held-out half has approved it, and the bounds are asked again of that fit rather than only of the half that earned it; a move outside them leaves the geometry at nominal, as every other refusal does. Detector tilt is held fixed, being gauge-coupled to the crystal orientation on a single crystal.
-3. **Pass 2** re-indexes de novo and re-integrates at the committed geometry. Only the **detector distance and beam centre** carry over: the refined cell, orientation and axis are what make the distance identifiable, but pass 2 re-indexes from scratch, so they are not propagated.
+   The fit is **cross-validated** on a deterministic split of the *reflections* (an avalanche-mixed $hkl$ hash, not a frame split and not an $h+k+l$ parity, which would collide with a centering condition and leave the held-out half empty): fitted on one half, committed only if it lowers the held-out residual — both families of it, since the excitation residual is the only evidence of the cell scale and the positional values outnumber it about three to one — and the move stays inside its bounds: every free cell angle within 1° and the beam centre within 15 px of the nearest centre anything already believes.
 
-The space group is determined **after** pass 2, on the geometry the run refined, and pass 1 does not search at all: a decision taken on the worse of the two passes and then carried forward is a constraint on the better one, and had to be reconciled with what pass 2 later found. The guard that chooses which pass is written compares each pass's **first** merge — $P1$ on both sides, full resolution range, before the correction surfaces — which both passes produce anyway, so it never compares statistics computed in two different space groups. One index-time veto remains and is keyed to pass 1's **lattice** rather than its group: a centred pass-1 lattice against a primitive pass-2 one.
+   The **distance and the cell lengths are bounded one step at a time, not as a whole**. One per cent was once a cap on the entire move, and as a cap it was the opposite of its job — a header is most worth correcting when it is most wrong, and a geometry genuinely several per cent out could never be reached (measured: a refused fit of 310.000 → 305.692 mm whose cell landed within 0.06 % of the deposited one). It is a **trust region** instead. The first solve is asked in the wide box around nominal exactly as before, so a fit that settles within one step commits unchanged; a fit that wants more is re-fitted as a *walk* of one-per-cent steps, each seeded where the last arrived and each required to lower the held-out residual, stopping where a step stops paying. A walk that uses every step it is allowed has not settled — it stopped because it ran out of steps, not because it arrived — and is refused, which is the runaway the cap stood in for, tested where it can be seen. A move of more than one step is additionally **ratified by re-indexing at where it arrived**: that is what separates the failure the cap was really aimed at (a second lattice, whose spots bias every cross-validation fold identically) from a wrong header, since a second lattice does not index better at the new geometry and a real distance error does.
+
+   The geometry the run commits is re-fitted on all the reflections once the held-out half has approved it — a walk from where it arrived, one step wide; everything else from nominal in the wide box — and the bounds are asked again of that fit rather than only of the half that earned it. A move outside them leaves the geometry at nominal, as every other refusal does, and the refusal says so in the report (`POSTREFINE_REFUSED`, with what the fit wanted) rather than passing silently. Detector tilt is held fixed, being gauge-coupled to the crystal orientation on a single crystal.
+3. **Pass 2** re-indexes de novo and re-integrates at the committed geometry. Only the **detector distance and beam centre** carry over: the refined cell, orientation and axis are what make the distance identifiable, but pass 2 re-indexes from scratch, so they are not propagated. Where that re-index indexes too few frames the run falls back to pass 1's lattice and integrates it at the refined geometry — and the cell is then **scaled to the distance it will be used at**, since a real-space cell is measured against the distance its spots were seen at, and carrying it across a distance change otherwise scales the whole cell by the ratio of the two. The orientation is untouched.
+
+The space group is determined **after** pass 2, on the geometry the run refined, and pass 1 does not search at all: a decision taken on the worse of the two passes and then carried forward is a constraint on the better one, and had to be reconciled with what pass 2 later found. The guard that chooses which pass is written compares each pass's **first** merge — $P1$ on both sides, full resolution range, before the correction surfaces — which both passes produce anyway, so it never compares statistics computed in two different space groups. What it compares there is the **signal each pass measured**: the count of unique reflections merged at $I/\sigma \ge 2$. Self-consistency cannot do this job — against an external arbiter the signal count named the more accurate geometry on 23 of 27 arm-dataset pairs where $R_\mathrm{meas}$, $CC_{1/2}$ and ISa managed 13, a coin flip — and that merge's own $CC_{1/2}$ least of all, being pooled over the whole range, uncut and uncorrected, so the shells with no signal in them dominate it and they are exactly the shells a geometry move disturbs (it reads 0.13 on a crystal whose data merge at 0.995). The refined pass is sent back only where it merges more unique reflections than its cell can hold, where it measured decisively less signal (10 %, and only where it holds no more reflections either — a wider integration disk pulls weak reflections in and dilutes the strong fraction without measuring less), or where it lost the axial rows the systematic absences are read off. One index-time veto remains and is keyed to pass 1's **lattice** rather than its group: a centred pass-1 lattice against a primitive pass-2 one.
 
 Only pass 2 is written, as the canonical `<prefix>_*` output. Pass 1's merge exists to give the guard something to judge pass 2 against, so it stops short of the parts of the merge that only fill in a file — the correction surfaces, the twinning and radiation-damage analyses, the R-free flags and the amplitudes — and writes no merged files of its own.
 
diff --git a/docs/CPU_DATA_ANALYSIS_INTEGRATION.md b/docs/CPU_DATA_ANALYSIS_INTEGRATION.md
index 23230649c..57207a4b2 100644
--- a/docs/CPU_DATA_ANALYSIS_INTEGRATION.md
+++ b/docs/CPU_DATA_ANALYSIS_INTEGRATION.md
@@ -378,6 +378,8 @@ Each surface is **cross-validated**: fitted on even-numbered frames and kept onl
 
 Each batch's $B$ is fitted on **resolution-shell means**, not on single observations: $\ln(I_\mathrm{ref}/I_\mathrm{obs})$ of one weak observation is unbounded and biased downwards — the observation appears in the response and in its own weight, and the logarithm needs $I_\mathrm{obs} > 0$, which keeps only the upward half of the noise — and on decayed data that bias grows with dose until it reverses the sign of the answer. The shells are laid inside the range the run actually diffracted to, and the fit carries an intercept as well as a slope, so a batch that is merely *dimmer* than the run (an attenuated beam, a mis-fitted frame scale) is not reported as damage. A batch whose shells are too weak to fit, or whose solved value reaches the bound the smoothing solve clamps to, is reported as **absent** rather than as a number. The first→last headline is reported only where a straight line describes the curve: radiation damage is progressive, so a curve that dips and recovers is a disturbance rather than dose, and is left to the sweep-quality report (`docs/RUGNUX_REPORT.md`) to name.
 
+**Frame disposition (rotation).** After the correction surfaces are fitted, and on the corrected fulls, rugnux measures **Δ*CC*₁⁄₂** — the overall *CC*₁⁄₂ of the merged data with a group of images minus the *CC*₁⁄₂ without it, over the reflections that group touches — for each 10° batch of the sweep and for each stretch the sweep-quality diagnostic flagged. It is computed in the σ-τ form (no random half-dataset split, so the answer is the same every run) with each reflection's error variance taken from the **observed** scatter of its own observations rather than from the error model's σ's: a bad stretch claims the same σ's as a good one, so an error-model estimate would read a batch that adds noise as a batch that adds precision, inverting the sign of the measurement. The leave-one-out is a subtraction of the group's own $(n, \sum I, \sum I^2)$ from the per-reflection totals, so measuring a group costs one pass over its observations rather than a re-merge, and reflections the group holds the only observations of are excluded from both sides — the published statistic's own restriction. Its standard error is reported beside it as that of a single *CC*₁⁄₂ on the same reflection count, $(1-CC^2)/\sqrt{n_\mathrm{refl}-3}$, and a Δ*CC*₁⁄₂ smaller than that says nothing; a group whose Δ*CC*₁⁄₂ is positive or near zero is not evidence of harm. A batch is removed only where its Δ*CC*₁⁄₂ is **both** several standard errors below zero (Fisher-transformed) **and** well below the run's own per-batch distribution (median − 3 robust σ, measured once before anything is removed), **and** where the per-image CC to the merge — an independent channel, measured on the partials one frame at a time — also says the stretch agrees with the run worse than a typical frame does, because selecting frames by their disagreement with the merge and then reporting that the merge improved is circular; its edges are then slid frame by frame with the whole stretch re-measured at each position — so the range is located finely while the count of reflections the verdict rests on stays that of the stretch — the worst range is removed, the reference is re-formed and the scan repeats, never past a quarter of the sweep and never over a stretch narrower than one rocking event. The resulting per-frame `merged` / `downgraded` / `rejected` ledger is in `docs/RUGNUX_REPORT.md`.
+
 ### 10.7 R-free test-set flags
 
 A fraction of the unique reflections (`rfree_fraction`, default 0.05) is flagged as a **free (test) set**, written to the output (MTZ `FreeR_flag`, mmCIF `_refln.status` = `f`, a text-HKL column) for model validation (§14) and for downstream refinement. The flag is a pure function of the reflection's **Friedel-merged (Laue) ASU index**, which gives three properties:
@@ -420,7 +422,7 @@ A reference dataset (`--reference-mtz`) supplies known intensities for the same
 
 ### 10.10 Ice rings at the scale and merge stages
 
-Where the gate of §3.3 has found ice, reflections falling within $\pm w$ in $q = 2\pi/d$ (§1.2) of a hexagonal-ice band ($w=0.03$ Å$^{-1}$ offline, about the measured ring half-width) are marked. Marked reflections are **excluded where a model is fitted** — the per-frame scale $G$, the per-image correlation, and the $P1$ merge the space-group search runs on — because ice contamination is a *positive bias*, not extra scatter, and a least-squares scale absorbs it into $G$ and into the error-model $b$, where it damages every other reflection on the same frame. They are **kept in the final merge**, which is also what the established scaling programs do by default, so the affected shells keep their completeness.
+Where the gate of §3.3 has found ice, reflections falling within $\pm w$ in $q = 2\pi/d$ (§1.2) of a hexagonal-ice band ($w=0.03$ Å$^{-1}$ offline, about the measured ring half-width) are marked. Marked reflections are **excluded where a model is fitted** — the per-frame scale $G$, the per-image correlation, and the $P1$ merge the space-group search runs on — because ice contamination is a *positive bias*, not extra scatter, and a least-squares scale absorbs it into $G$ and into the error-model $b$, where it damages every other reflection on the same frame. They are also left out of the **resolution-cut fit** (§13.4), which is the one consumer that reads the *merged* reflections rather than the observations: an ice-flagged observation marks its merged reflection, on the rotation merge's own accumulator (host and device alike) as well as on the stills one. They are otherwise **kept in the final merge**, which is also what the established scaling programs do by default, so the affected shells keep their completeness.
 
 Nothing on an ice band is deleted from the merged output. Deleting the bands was implemented, measured against an external arbiter rather than against the merge's own statistics, and removed: on the one rotation-battery crystal where a band was both dead by its own merged $\mathrm{CC}_{1/2}$ and scorable by anomalous peak height, dropping it changed the mean anomalous density at the known sites by $-0.001\pm0.018\,\sigma$ — about 2 % of the site height — while removing 1149 unique reflections whose mean $I/\sigma$ was 3.62 against the dataset's own 3.05, i.e. better-than-average data, and costing 6 to 8 points of completeness in the affected shell.
 
diff --git a/docs/DEPLOYMENT.md b/docs/DEPLOYMENT.md
index 11ae9f932..e4a4e0bcf 100644
--- a/docs/DEPLOYMENT.md
+++ b/docs/DEPLOYMENT.md
@@ -37,7 +37,7 @@ Frontend web user interface has to be built separately with:
 $ cd build
 $ make frontend
 ```
-Frontend files (.html and .js) will be placed in `frontend/dist` (outside of `build/` directory!) and has to be copied to a general location, e.g. `/usr/local/jfjoch/frontend` or `/opt/jfjoch/frotend`.
+Frontend files (.html and .js) will be placed in `frontend/dist` (outside of `build/` directory!) and has to be copied to a general location, e.g. `/usr/local/jfjoch/frontend` or `/opt/jfjoch/frontend`.
 
 ## Flash the U55C FPGA card with a proper image and install Linux kernel driver.
 
@@ -58,7 +58,7 @@ LnkSta:     Speed 16GT/s (ok), Width x8 (ok)
 (...)
 ```
 
-3. Download the MCS image from release files or build it using Vivado (WARNING! building time can be about 8 hours and doesn't allways reach correct timing).
+3. Download the MCS image from release files or build it using Vivado (WARNING! building time can be about 8 hours and doesn't always reach correct timing).
 4. Flash the card with `xbflash.qspi` tool (part of Jungfraujoch). For fresh card use:
 ```
 sudo xbflash.qspi --primary <path to MCS file> --card <PCIe slot from above> --bar-offset 0x1f06000 
diff --git a/docs/DETECTORS.md b/docs/DETECTORS.md
index a4d56b76b..0aea6d09a 100644
--- a/docs/DETECTORS.md
+++ b/docs/DETECTORS.md
@@ -1,8 +1,8 @@
 # Supported detectors
 
 ## PSI detectors
-Jungfraujoch supports PSI JUNGFRAU and PSI EIGER detectors. Jungfruajoch controls the detector via statically compiled `slsDetectorPackage` into its source code.
-It is important that detector firmware has to match `slsDetectorPackage` version used in Jungfraujoch.
+Jungfraujoch supports PSI JUNGFRAU and PSI EIGER detectors. Jungfraujoch controls the detector via statically compiled `slsDetectorPackage` into its source code.
+The detector firmware must match the `slsDetectorPackage` version used in Jungfraujoch.
 The default is 8.0.2; 9.2.0 is built with the `SLS9=ON` CMake option and published in the `slsdet9`
 [package repositories](REPOSITORIES.md).
 See [PSI Detector group website](https://www.psi.ch/en/lxn/software-releases) for details.
diff --git a/docs/DETECTOR_GEOMETRY.md b/docs/DETECTOR_GEOMETRY.md
index 2b62eeafe..d410cfb43 100644
--- a/docs/DETECTOR_GEOMETRY.md
+++ b/docs/DETECTOR_GEOMETRY.md
@@ -129,4 +129,4 @@ being in the bottom left corner and Y values increasing upwards. Such a conventi
 
 In general, convention is controlled in Jungfraujoch with a setting in the JSON configuration file, which allows mirroring detector in Y.
 
-Extra care has to be taken by the user to ensure that no errors are made.
\ No newline at end of file
+The convention in use is worth checking whenever a geometry is carried between programs.
\ No newline at end of file
diff --git a/docs/FPGA_DATA_ANALYSIS.md b/docs/FPGA_DATA_ANALYSIS.md
index a392f0b45..a9205fe70 100644
--- a/docs/FPGA_DATA_ANALYSIS.md
+++ b/docs/FPGA_DATA_ANALYSIS.md
@@ -33,7 +33,7 @@ Corrections were implemented according to formulas developed by [Jensen et al. (
 
 Given FPGA limitations, split-pixels cannot be implemented and number of bins is limited as 2048 per detector module.
 This way 2D azimuthal integration, as needed for example by SAS-TT, cannot be currently implemented with the FPGA card and needs to be done on a CPU.
-One needs to be careful with per-pixel corrections - their acceptable range is constrained by 16-bit pixed point integer implementation
+One needs to be careful with per-pixel corrections - their acceptable range is constrained by 16-bit fixed point integer implementation
 and is tuned for standard SAXS/WAXS range.
 
 As with ROIs, azimuthal integration is also available on CPU through the shared analysis library,
@@ -66,7 +66,7 @@ ROIs are not specific to the FPGA path. The same ROI definitions — box, circle
 engine, so ROI statistics are produced both for the FPGA-accelerated JUNGFRAU/PSI workflow and for
 detectors driven through DECTRIS SIMPLON (e.g. EIGER), which have no FPGA acquisition path.
 
-## Pixel statisitics
+## Pixel statistics
 The following statistics are collected for each module:
 * Number of masked pixels
 * Number of saturated pixels (excl.masked)
diff --git a/docs/HARDWARE.md b/docs/HARDWARE.md
index 527c28441..24e55706e 100644
--- a/docs/HARDWARE.md
+++ b/docs/HARDWARE.md
@@ -7,12 +7,12 @@ Operating Jungfraujoch requires the following:
 4. (optionally) 100G switch to connect FPGA and the detector
 
 Unfortunately, at the moment it is not possible to purchase server configuration from a major vendor that would include 
-AMD FPGA boards. Therefore, the two has to be purchases separately. This might have impact on the warranty for the hardware 
+AMD FPGA boards. Therefore, the two have to be purchased separately. This might have impact on the warranty for the hardware 
 and has to be clarified with the vendor. PSI only supports the system on the best effort basis and doesn't take any responsibility
 for warranty limitations for operating FPGA boards in the server. Having said this - we didn't encounter any hardware issues so far.
 
 ## High performance server
-PSI is using HPE DL380 Gen11 servers are the moment to operate Jungfraujoch systems. However, this is because of general 
+PSI is using HPE DL380 Gen11 servers at the moment to operate Jungfraujoch systems. However, this is because of general 
 preference for this vendor, there is no Jungfraujoch-specific reason to buy from this vendor. We do expect that system 
 from any other vendor with similar specification should work as well.
 
@@ -24,7 +24,7 @@ At PSI, we use the following configuration of HPE DL380 Gen11 to operate 9M pixe
 * Copper 1G/10G network 
 
 ### PCI slots
-When ordering the system it is important to ensure enough PCIe cards can be accommodated in the system. 
+When ordering the system, check that it can accommodate enough PCIe cards. 
 In case of our system we need to put at least seven PCIe cards: 4 x FPGA, 2x GPU, 1x network
 
 Note - for FPGA x8 lane electrically/x16 lane mechanically PCIe slots are OK.
@@ -42,6 +42,11 @@ Operating fast-feedback indexer code requires operation of a graphic processing
 For practical reasons, i.e. power consumption and cost, we choose inference grade card Nvidia L4. 
 In the past we have also used T4 cards. So, in principle any recent CUDA compatible GPU should work.
 
+Offline processing with [`rugnux`](RUGNUX.md) has a requirement of its own, unrelated to the frame
+rate the acquisition side is sized for: one run wants 3-7 GB on the card and up to 14 GB of host
+RAM, so a server that also reprocesses data needs headroom beyond the online pipeline's. The
+sizing table is in [Installing rugnux ▸ Memory](RUGNUX_INSTALL.md#memory).
+
 ## Network switch
 Small detectors (up to 4M pixel) can be in principle operated without switch. In this case one needs `8x10g` variant 
 of the Jungfraujoch FPGA image, which allows to directly connect 4 JUNGFRAU modules to one U55C card. 
@@ -51,5 +56,5 @@ impractical for larger systems or more complex deployments, like multiple detect
 In this case one needs a network switch. 
 
 We currently use Nvidia/Mellanox SN2100 switch, though there is no reason not to use other models/other vendors.
-For switches with only 100G ports it is important to ensure, that these can be split into 4x10G ports to connect the detector.
+A switch with only 100G ports must support splitting them into 4x10G ports to connect the detector.
 
diff --git a/docs/HDF5.md b/docs/HDF5.md
index 63defde82..35c64edf0 100644
--- a/docs/HDF5.md
+++ b/docs/HDF5.md
@@ -118,7 +118,7 @@ holds *all* the derived analysis (everything in §4) plus a virtual view
 of the raw images — without duplicating terabytes of data.
 
 This is a particularly FAIR-friendly artefact: it can be shared or archived alongside (or instead
-of) the raw data to convey what is in a dataset and how it processed, while the `/entry/data/data`
+of) the raw data to convey what is in a dataset and how it was processed, while the `/entry/data/data`
 VDS still resolves to the original images when they are available. `rugnux` can also process
 an equally-spaced *subset* of images (start/end/stride), producing a down-sampled reference set.
 
@@ -352,6 +352,7 @@ In legacy/VDS mode these live in the data files and are linked/virtual-stacked i
 | `imageScaleCC` | | on-the-fly scaling correlation coefficient |
 | `imageScaleMosaicity` | deg | scaling-model mosaicity |
 | `sweepQuality` | | why this image's stretch of the sweep was flagged — see below |
+| `frameDisposition` | | what became of this image's observations in the merged data — see below |
 
 **Per-image lattices:** `latticeIndexed` `[n_images, 9]` (Å) — the real-space lattice (flattened
 3×3); `latticeIndexedExtra` `[n_images, max_extra_lattices, 9]` (Å) — additional orientation
@@ -401,14 +402,21 @@ image belongs to was flagged as delivering much less than the rest of the run: *
 not, and any other value is a **1-based index into `sweepQualityReasons`**, a string vector written
 beside it that carries the whole vocabulary, so the codes can be read without this source. The
 vocabulary is closed and stable — a code is never renamed and never reused — and currently reads
-`no_diffraction`, `crystal_out_of_beam`, `weak_diffraction`, `loss_of_centring`, `radiation_damage`;
-[the rugnux results report](RUGNUX_REPORT.md#sweep-quality-and-the-reason-vocabulary) defines what each one
-means. Both datasets are **absent** unless the sweep-quality diagnostic ran, which needs scaling and
-merging; their absence therefore means "not looked for", *not* "every image clean". Written by the
-offline `rugnux` path only — the broker does not merge — and not carried on the CBOR stream, in the
-same way as the other offline-only fields (`space_group_number`, the refined geometry). Nothing is
-excluded from processing on the strength of it. The condensed, dataset-wide form of the same finding
-is in `<prefix>_report.txt`.
+`no_diffraction`, `crystal_out_of_beam`, `weak_diffraction`, `loss_of_centring`, `radiation_damage`,
+`inconsistent_with_merge`;
+[the rugnux results report](RUGNUX_REPORT.md#sweep-quality-the-disposition-and-their-vocabularies)
+defines what each one means. Both datasets are **absent** unless the sweep-quality diagnostic ran,
+which needs scaling and merging; their absence therefore means "not looked for", *not* "every image
+clean". Written by the offline `rugnux` path only — the broker does not merge — and not carried on the
+CBOR stream, in the same way as the other offline-only fields (`space_group_number`, the refined
+geometry). The condensed, dataset-wide form of the same
+finding is in `<prefix>_report.txt`.
+
+**Frame disposition.** `frameDisposition` `[n_images]` (`uint8`) says what became of the image's
+observations: a **0-based index into `frameDispositionCodes`**, written beside it, which reads
+`merged`, `downgraded`, `rejected`. Where `sweepQuality` says what was *seen* over a stretch, this
+says what was *done* about it — a `rejected` image contributed nothing to the merged intensities.
+Same availability rule as `sweepQuality`: absent means the diagnostic never ran.
 
 CrystFEL can read the spots directly with:
 
diff --git a/docs/IMAGE_STREAM.md b/docs/IMAGE_STREAM.md
index 02c4284a3..32b8dd56b 100644
--- a/docs/IMAGE_STREAM.md
+++ b/docs/IMAGE_STREAM.md
@@ -20,7 +20,7 @@ All sockets will forward start and end messages. Only first socket will forward
 
 ### ZeroMQ image stream
 This is using PUSH ZeroMQ socket(s).
-It should be strictly avoided to have multiple receivers connected to one PUSH ZeroMQ socket.
+Multiple receivers must never be connected to one PUSH ZeroMQ socket.
 ZeroMQ will send the images in a round-robin basis to the receivers.
 In this case start and end messages will end up only with one receiver.
 Instead, Jungfraujoch feature of multiple sockets should be used.
diff --git a/docs/JFJOCH_VIEWER.md b/docs/JFJOCH_VIEWER.md
index 8edccd920..bd2ff816d 100644
--- a/docs/JFJOCH_VIEWER.md
+++ b/docs/JFJOCH_VIEWER.md
@@ -55,10 +55,10 @@ install it.
 - **Settings** panel for the geometry, unit cell, spot finding, indexing, azimuthal integration,
   Bragg integration, scaling, powder calibration and a reference dataset — the same settings the
   CLI takes.
-- Auxiliary windows: image list, dataset metadata, spot list, reflection list, reciprocal-space
-  viewer, 2D azimuthal-integration image, calibration-image viewer and a magnifier; plus the
-  *Inspector* (per-image statistics, image features, resolution rings, ROI statistics), the
-  *Image strip* thumbnail feed and dataset-info charts.
+- Auxiliary windows: image list, dataset metadata, spot list, reflection list,
+  2D azimuthal-integration image, calibration-image viewer and a magnifier; plus the
+  *Inspector* (per-image statistics, image features, resolution rings, ROI statistics) and
+  dataset-info charts.
 - The *Inspector*'s **Image features** section decides what the overlay draws — spots, predictions,
   saturated and highest pixels, the beam stop — including whether the non-indexed spots and the
   spots that fall on an ice ring are drawn at all.
@@ -71,6 +71,10 @@ install it.
   licenses.
 - Layout presets (*View ▸ Image layout / Processing layout / Reset layout*) rearrange the docks for
   looking at images or at processing results.
+- *View ▸ Font size* (or `Ctrl`+`+` / `Ctrl`+`-`) enlarges the text to 125 % or 150 %, on top of
+  whatever scaling the desktop already applies, and the choice is remembered across restarts. The
+  viewer also follows the desktop's own text scaling or display scaling on its own; over `ssh -X`,
+  where no settings daemon delivers it, launch as `QT_SCALE_FACTOR=1.5 jfjoch_viewer` instead.
 
 ## Hardware
 
@@ -87,6 +91,14 @@ installer and the `.tgz` are CUDA 13 and CUDA 12 respectively, which also decide
 they run on — a V100 needs the CUDA 12 `.tgz`. See
 [Release contents ▸ GPU generations and the NVIDIA driver](RELEASE_CONTENTS.md#gpu-generations-and-the-nvidia-driver).
 
+### Remote displays
+
+The viewer detects a remote display session (`ssh -X` and the like) and limits how often panning,
+zooming and live playback repaint, since on such a link every repaint is shipped as pixels. The
+detection can be overridden in *View ▸ Remote display mode* or with `JFJOCH_VIEWER_REMOTE=0`/`1`.
+A VNC- or xpra-based remote desktop still transports the viewer far more efficiently than plain
+X11 forwarding.
+
 ## Mouse shortcuts
 
 The same list is available in the application under **Help ▸ Mouse Shortcuts**.
@@ -98,9 +110,10 @@ The same list is available in the application under **Help ▸ Mouse Shortcuts**
 | Wheel | Zoom in / out, centred on the cursor |
 | `Shift` + wheel | Move the foreground (upper contrast limit) in linear steps |
 | `Ctrl` + wheel | Move the foreground in multiplicative steps (×1.15 per notch) |
-| `Alt` + wheel | Step through the dataset, one image per notch (up = next image) |
 | `F` held + wheel | Same as `Shift` + wheel, for as long as `F` is held |
-| `A` | Switch on the automatic foreground |
+| `A` | Apply auto-contrast once; press it again to switch on continuous Auto |
+| `Home` / `End` | Jump to the first / last image in the dataset |
+| `Page Up` / `Page Down` | Step one image forward / back |
 | Hover | Status bar shows the pixel position, its value and the resolution |
 | Drag | Pan the image |
 | `Shift` + drag | Draw a rectangular ROI |
@@ -108,9 +121,6 @@ The same list is available in the application under **Help ▸ Mouse Shortcuts**
 | Drag an ROI or its handle | Move or resize the selected ROI |
 | Right click | Copy / save the image, fit to view, clear the ROI |
 
-Some window managers take `Alt`-modified mouse events for themselves before the application sees
-them; that is a window-manager setting, not something the viewer can take back.
-
 ### Grid scan
 
 | Action | Effect |
@@ -128,10 +138,6 @@ them; that is a window-manager setting, not something the viewer can take back.
 | Dataset-info plot: `Shift` + hover | Load the hovered image |
 | Spot / reflection list: double click | Zoom the diffraction image on that spot or prediction |
 | Image list: double click | Load that image |
-| Reciprocal space: drag | Rotate the view |
-| Reciprocal space: right drag | Pan the view |
-| Reciprocal space: wheel | Zoom the view |
-| Reciprocal space: double click | Zoom the diffraction image on the nearest spot |
 | Magnifier: wheel | Zoom the magnifier; it follows the cursor on the main image |
 
 ## Opening data
@@ -153,7 +159,10 @@ can drive it:
   and display the given image.
 - `LoadImage(image_number, summation=1)` — navigate to an image in the already-open dataset.
 
-`summation` sums that many consecutive images before display.
+`summation` sums that many consecutive images before display. A repeated `LoadFile` call naming the
+file that is already open is cheap (it just navigates, like `LoadImage`) rather than reopening it,
+but a client stepping through images of a dataset it opened itself should still prefer `LoadImage` —
+it needs no filename and avoids the file-identity comparison.
 
 ## Building from source on Windows
 
@@ -173,21 +182,6 @@ Verified toolchain — the same one the released installer is built with:
 - CMake plus Ninja. The CMake that ships with Visual Studio is the simplest choice and works out of
   the box — it comes with the C++ workload, so there is nothing extra to install. Any recent
   standalone CMake (from cmake.org, or the one bundled with Qt in `C:\Qt\Tools\CMake_64`) works too.
-- zlib and Eigen — the two libraries not auto-fetched on Windows. Build/install both into one prefix
-  (here `C:\deps`) and point CMake at it:
-  ```
-  :: static zlib
-  git clone --branch v1.3.1 https://github.com/madler/zlib
-  cmake -G Ninja -S zlib -B zlib-build -DCMAKE_INSTALL_PREFIX=C:/deps
-  cmake --build zlib-build --target install
-  :: Eigen 3.4 (header-only) -- install just the headers with `cmake --install`; the BLAS/LAPACK/test
-  :: targets are disabled since they are not needed (and fail to build under MSVC). Use the 3.4 series:
-  :: the project requests find_package(Eigen3 3.4), which Eigen's same-major rule rejects for 5.x.
-  git clone --branch 3.4.0 https://gitlab.com/libeigen/eigen.git
-  cmake -G Ninja -S eigen -B eigen-build -DCMAKE_INSTALL_PREFIX=C:/deps ^
-    -DEIGEN_BUILD_BLAS=OFF -DEIGEN_BUILD_LAPACK=OFF -DEIGEN_BUILD_DOC=OFF -DBUILD_TESTING=OFF
-  cmake --install eigen-build
-  ```
 - Optional: [NSIS](https://nsis.sourceforge.io) to build the `.exe` installer.
 
 Configure and build from an **x64 Native Tools Command Prompt for VS 2026** (so `cl`, `nvcc` and
@@ -195,14 +189,14 @@ Configure and build from an **x64 Native Tools Command Prompt for VS 2026** (so
 
 ```
 cmake -G Ninja -B build-win -DCMAKE_BUILD_TYPE=Release ^
-  -DCMAKE_PREFIX_PATH="C:/deps;C:/Qt/6.11.1/msvc2022_64"
+  -DCMAKE_PREFIX_PATH="C:/Qt/6.11.1/msvc2022_64"
 cmake --build build-win --target jfjoch_viewer
 ```
 
 Notes:
 
-- `CMAKE_PREFIX_PATH` (the `C:/deps` prefix plus Qt) is the only required flag — CMake finds zlib and
-  Eigen from the prefix, so no separate `-DZLIB_ROOT` is needed.
+- `CMAKE_PREFIX_PATH` (Qt) is the only required flag. Every other dependency, zlib and Eigen
+  included, is downloaded and built by the configure itself, so nothing else has to be installed.
 - The CUDA toolchain is located automatically from the `CUDA_PATH` environment variable that the
   CUDA installer sets (or from `nvcc` on `PATH`). Pass `-DCMAKE_CUDA_COMPILER=".../bin/nvcc.exe"`
   only if `nvcc` is installed in a nonstandard location and is not found.
diff --git a/docs/RELEASE_CONTENTS.md b/docs/RELEASE_CONTENTS.md
index 139ef2daf..2e1e91c82 100644
--- a/docs/RELEASE_CONTENTS.md
+++ b/docs/RELEASE_CONTENTS.md
@@ -136,7 +136,7 @@ The toolchain bounds of the released installer are:
   through it — and it is what the release is compiled with.
 - **CUDA Toolkit 13.3** for the `cuda13` variant.
 - **Qt 6.11** for MSVC (`msvc2022_64`), including Qt Charts.
-- Ninja as the generator; zlib and Eigen 3.4 supplied from a build prefix.
+- Ninja as the generator; every third-party library is fetched and built by the configure.
 
 The installer is generated with NSIS and **bundles the Qt runtime** (via `windeployqt`) and, on the
 CUDA variant, the cuFFT DLL — so the end user installs neither Qt nor a CUDA toolkit. The two
diff --git a/docs/RUGNUX.md b/docs/RUGNUX.md
index c19febc56..368ff7923 100644
--- a/docs/RUGNUX.md
+++ b/docs/RUGNUX.md
@@ -107,6 +107,10 @@ A few things worth knowing before reaching for more flags:
   intensities are usable at all.
 - **`--scaling-high-resolution <d>`**, where the resolution is already known, sharpens both the
   space-group search and the error model.
+- **A run wants memory in proportion to what it integrates**, not to the detector: 2.5-14 GB of
+  host RAM and 3-7 GB on the card over the datasets measured, both peaking in scaling and
+  merging. [Installing rugnux ▸ Memory](RUGNUX_INSTALL.md#memory) has the table and the two
+  flags that lower it.
 - Everything else is in [Running rugnux](RUGNUX_TUTORIAL.md#running-rugnux) and the full
   [Command-line options](RUGNUX_ADVANCED.md#command-line-options).
 
diff --git a/docs/RUGNUX_ADVANCED.md b/docs/RUGNUX_ADVANCED.md
index 3f3fc9f94..9c4e7f8e4 100644
--- a/docs/RUGNUX_ADVANCED.md
+++ b/docs/RUGNUX_ADVANCED.md
@@ -290,7 +290,7 @@ For very long axes the direction grid's angular resolution binds well below 500
 | `-X, --indexing-algorithm <txt>` | `FFBIDX` \| `FFT` \| `FFTW` \| `Auto` \| `None` |
 | `-C, --unit-cell <cell>` | Reference unit cell `"a,b,c,alpha,beta,gamma"` (required by `ffbidx`). On rotation data it also widens the FFT search to cover the cell given, at both ends: the longest axis looked for is raised to reach it, and `--fft-min-unit-cell` is lowered to admit it |
 | `--fft-min-unit-cell <num>` | Shortest cell axis the FFT search accepts, Å (default: 10). A candidate with a shorter axis is discarded — but a de-novo rotation run also runs a **second first-pass hypothesis with the floor lowered to 5 Å by default**, adopted when the standing cell turns out to be an integer supercell of what it finds, so a small-molecule cell is indexed without this flag. `-C` lowers the floor on its own to cover the cell given (and the second hypothesis then stays out of the way). On stills, where neither applies, a crystal below the floor cannot be indexed unless this is lowered |
-| `--min-indexed-spots <num>` | Spots a frame must have on the lattice before it counts as indexed (default: 6). The rotation first pass scores candidate lattices on that count, so on a pattern with fewer spots per frame no lattice can score and the run gives up; integration itself is not gated by it |
+| `--min-indexed-spots <num>` | Spots a frame must have on the lattice before it counts as indexed (default: 6, minimum 4). It sets the reported indexing rate and the count the rotation first pass ranks candidate lattices by; whether the run has a lattice at all is decided on the pooled spots instead ([§4.1](CPU_DATA_ANALYSIS_INDEXING.md#indexed-spot-decision-inlier-test)), and integration is not gated by it |
 | `-S, --space-group <num\|symbol>` | Space group number (`92`) or Hermann-Mauguin symbol (`P43212`) — for indexing and scaling |
 | `-r, --refine <txt>` | Geometry refinement: `none` \| `orientation` \| `beam_and_lattice` (default) \| `flex` (try all three per image, keep whichever indexes the most spots; alias `multi`) |
 | `-R, --two-pass-rotation[=num]` | Two-pass offline rotation indexing (default for goniometer data; optional first-pass image count, default 100) |
diff --git a/docs/RUGNUX_INSTALL.md b/docs/RUGNUX_INSTALL.md
index 7f6e16de3..87be0e561 100644
--- a/docs/RUGNUX_INSTALL.md
+++ b/docs/RUGNUX_INSTALL.md
@@ -84,9 +84,8 @@ cmake -S . -B build -DJFJOCH_RUGNUX_ONLY=ON -DCMAKE_BUILD_TYPE=Release \
 cmake --build build -j$(nproc) --target rugnux
 ```
 
-The binary lands in `build/rugnux/rugnux`. Two dependencies must come from the system — **zlib** and
-**Eigen ≥ 3.4** (`zlib-devel` and `eigen3-devel`, or their Debian equivalents); everything else is
-downloaded during the first configure, which therefore needs network access. `cmake --build build
+The binary lands in `build/rugnux/rugnux`. No library has to come from the system: every dependency
+is downloaded and built during the first configure, which therefore needs network access. `cmake --build build
 --target package` produces the same `.tgz` the release ships. The `-march` flag is not set by the
 build system on purpose, so a plain build is slower than the released one on the CPU-bound stages —
 see the note in `CMakeLists.txt`.
@@ -106,3 +105,49 @@ newer for the CUDA 13 ones (RHEL 9, Ubuntu, the aarch64 and Windows `rugnux` arc
 generations each artefact supports — a V100 in particular works only with the CUDA 12 build — is in
 [Release contents ▸ GPU generations and the NVIDIA driver](RELEASE_CONTENTS.md#gpu-generations-and-the-nvidia-driver).
 
+### Memory
+
+A run's memory is set by **how many reflection observations it integrates**, not by how many pixels
+the detector has. Measured on rc.169 at `-N 6`, over rotation sweeps of 1200-1800 frames:
+
+| Detector | Observations integrated | Host (peak RSS) | Device |
+| --- | --- | --- | --- |
+| 1679 x 1475 (2.5 MP) | 25 M | 7.8 GB | 3.8 GB |
+| 2527 x 2463 (6.2 MP) | 13 M | 4.9 GB | 3.1 GB |
+| 3262 x 3108 (10.1 MP) | 7 M | 2.5 GB | 3.0 GB |
+| 4371 x 4150 (18.1 MP) | 13 M | 4.3 GB | 3.2 GB |
+| 4371 x 4150 (18.1 MP) | 20 M | 6.0 GB | 4.4 GB |
+| 3262 x 3108 (10.1 MP) | 50 M | 14.2 GB | 7.0 GB |
+
+Two sweeps on the same detector differ by a factor of five, so size the machine on the observation
+count rather than on the detector. As a rule, **0.6 GB + 0.3 GB of host memory per million
+observations, and 2.4 GB + 0.1 GB of device memory per million**. The run reports what it actually
+integrated — `RotationScaleMerge: ingested ... partial observations`. **32 GB of host RAM and an
+8 GB card** cover every dataset measured here at `-N 6`; an ordinary sweep needs 16 GB and 6 GB.
+
+Both peaks fall in **scaling and merging**, not in the per-image loop: the loop alone stays under
+3.2 GB on the device whatever the detector. The stage that needs the most is the 3D combine.
+
+`-N` multiplies the per-image loop only — about **8 bytes of device memory per detector pixel per
+worker** (150 MB per worker at 18 MP, 87 MB at 6 MP) on top of a fixed ~2.6 GB, and it is linear
+with no ceiling: the same 18 MP sweep takes 2.7 GB of device memory at `-N 1`, 3.2 GB at `-N 6` and
+8.0 GB at `-N 32`. Host memory does not move with `-N`, and neither does the merge's own device
+memory. Where several runs share one card, `-N` is the knob that decides how many fit.
+
+To use less:
+
+- **`-N`** — the only flag that lowers the per-image loop's device memory. Lowering it is what
+  rescues a run on a card that is otherwise full.
+- **`--no-merge`** — on the heaviest sweep measured it took the host peak from 14.2 to 8.3 GB and
+  the device peak from 7.0 to 2.9 GB. It also gives up the merged output.
+- **`--no-export-unmerged`** does **not** save memory. `<prefix>_unmerged.mtz` is the largest file a
+  run writes, but its observations are resident either way; the flag saves disk, not RAM.
+
+Nothing measures the free memory on the card before allocating. A run that does not fit degrades
+where it can — device decompression falls back to the host, the beam-stop projection falls back to
+the host, an indexer thread that cannot allocate reports the frame as not indexed — and **fails the
+run otherwise**, with `Processing failed: CUDA (GPU) error (Failed to allocate device memory)` and a
+non-zero exit status. That is deliberate: a CUDA out-of-memory says nothing about the frame in
+flight and everything about the machine, so skipping frames would leave a run that looks complete
+with quietly different merged numbers. A run is never silently short; it either completes or fails.
+On a GPU shared with another job, lower `-N` or wait for the card.
diff --git a/docs/RUGNUX_REPORT.md b/docs/RUGNUX_REPORT.md
index 689ad95da..c6abb731d 100644
--- a/docs/RUGNUX_REPORT.md
+++ b/docs/RUGNUX_REPORT.md
@@ -27,15 +27,17 @@ case — so a script branches on the exit status first and greps the report seco
 ## Format
 
 The model is XDS's `CORRECT.LP`: prose and tables a crystallographer reads top to bottom, with a
-structure a script can consume without parsing prose.
+structure a script can consume without parsing prose. Every line is one of three kinds — a
+`KEY= value` data line, a `#` comment, or blank — so `grep -v '^#'` leaves the data alone
+(since `REPORT_VERSION= 8`; before that, comment lines had no prefix).
 
 - **`KEY= value` assignment lines.** Every number worth extracting is one, so a consumer gets it with
   a single `grep '^ISA= '` and never has to read a sentence. Key names are stable.
-- **Fixed-width tables** with a stable header row for anything that is genuinely tabular — the
-  resolution shells, the space-group candidates, the sweep-quality ranges.
-- **`WARNING:` lines**, one per finding, in plain English: `WARNING: Frames 500-600 out of beam
-  (10.1 deg, scale 0.12 and CC 0.30 of the run, 2% scaled)`. `grep '^WARNING:'` finds every one.
-- **Section banners** (`***…***` around a numbered title) delimiting the blocks.
+- **`#` comment lines** — everything else: the prose, the section banners, and the fixed-width
+  tables (stable header row; the resolution shells, the space-group candidates, the sweep-quality
+  ranges).
+- **`# WARNING:` lines**, one per finding, in plain English: `# WARNING: Frames 500-600 out of beam
+  (10.1 deg, scale 0.12 and CC 0.30 of the run, 2% scaled)`. `grep '^# WARNING:'` finds every one.
 
 **A quantity the run did not measure writes no key at all**, and the fixed-width tables print `-` in
 its place. There is one rule and no placeholders — no `nan`, and no `0.0%` that reads as a measured
@@ -46,18 +48,28 @@ not `-A` was given, but where no Bijvoet pair could be split in both hands — a
 `-A`, or too few pairs — the quantity does not exist and the key is absent; `COMPLETENESS=`,
 `MULTIPLICITY=`, `I_OVER_SIGMA=`, `R_MEAS=`, `CC_HALF=` and `WILSON_B=` follow the same rule.
 
-The last block before `END OF REPORT` is the acknowledgement — the crystallographic methods rugnux
-implements were published by the X-ray research community and the program is built on open-source
-software from many projects, both credited in `ACKNOWLEDGEMENT.md` beside `LICENSE` and
-`THIRD_PARTY_NOTICES.md` in the installed package. rugnux prints the same lines at startup.
+The last blocks before `END OF REPORT` are the authorship and the acknowledgement: who wrote
+rugnux, its licence (GPLv3 — free to use for academic institutions and commercial companies alike)
+and where releases are published, then the credit to the X-ray research community whose methods
+rugnux implements and the open-source projects it is built on — both credited in
+`ACKNOWLEDGEMENT.md` beside `LICENSE` and `THIRD_PARTY_NOTICES.md` in the installed package.
+rugnux prints the acknowledgement at startup as well.
 
 `REPORT_VERSION=` is the format's own version. Key names, table columns and the reason vocabulary
 below are an interface other software may depend on: they do not change without that number moving.
 Adding a key does not move it — a consumer that greps for what it needs is unaffected by one more
-line.
+line. It counts releases, not changes: it moves at most once per release, however many format
+changes that release carries, because a reader only ever meets the format that was released.
 
 The header block above section 1 records **how the result was produced**: `RUGNUX_VERSION=` and
-`RUGNUX_GIT=`, `DATE=`, `INPUT_FILE=` and `OUTPUT_PREFIX=`, plus
+`RUGNUX_DOWNLOAD=` (the release page of exactly that version), `RUGNUX_GIT=`, `BUILD_CXX_FLAGS=`,
+`DATE=`, `INPUT_FILE=` and `OUTPUT_PREFIX=`, plus
+
+- **`RUGNUX_GIT=`** — the commit the binary was built from, stamped at build time so it cannot go
+  stale in a reconfigured tree; a `-dirty` suffix marks a build from uncommitted changes.
+- **`BUILD_CXX_FLAGS=`** — the compiler flags of the build (`NONE` for a plain configure). Two
+  builds of one commit can differ by flags alone, and `-march` moves the CPU-bound results, so a
+  comparison of two reports starts here.
 
 - **`COMMAND_LINE=`** — the invocation as one shell-ready line, arguments containing spaces quoted.
 - **`WALL_TIME=`** — the whole invocation in seconds. It covers everything the process did, opening
@@ -161,31 +173,45 @@ inversion centre, so a reader who knows their sample is a protein reads this key
 run. Where no glide was found the two keys read the same, deliberately: greppability is the point, and
 a key that appears only sometimes has to be tested for before it can be read.
 
-## Sweep quality and the reason vocabulary
+## Sweep quality, the disposition, and their vocabularies
 
 Section 4 lists the stretches of the sweep over which the crystal delivered much less than the rest
 of the run — the feedback a beamline control system needs to tell an operator that a crystal should
-be recentred or recollected. Nothing is excluded on the strength of it; the frames still carry
-signal, and this is a message for the beamline, not a filter.
+be recentred or recollected — says what became of each of them, and measures what keeping each one
+costs the merged intensities — and drops the stretches that cost too much.
 
 ```
 SWEEP_QUALITY_STATUS= COMPUTED
-SWEEP_QUALITY_COUNT= 1
-SWEEP_QUALITY_REASONS= no_diffraction crystal_out_of_beam weak_diffraction loss_of_centring radiation_damage
+SWEEP_QUALITY_COUNT= 2
+SWEEP_QUALITY_REASONS= no_diffraction crystal_out_of_beam weak_diffraction loss_of_centring radiation_damage inconsistent_with_merge
+SWEEP_DISPOSITIONS= merged downgraded rejected
+FRAMES_MERGED= 1712
+FRAMES_DOWNGRADED= 52
+FRAMES_REJECTED= 36
+FRAMES_REJECTED_PCT= 2.00
+ROTATION_REJECTED_DEG= 7.2
 SWEEP_ROTATION= 360.0
 FLUX_PEAK_TO_TROUGH= 1.03
 SCALE_MODULATION_PEAK_TO_TROUGH= 1.00
 
-  FIRST_IMAGE   LAST_IMAGE   N_IMAGES  ROTATION  REASON                SEVERITY   SCALE      CC   INDEXED
-  -----------  -----------  ---------  --------  --------------------  --------  ------  ------  --------
-          500          600        101      10.1  crystal_out_of_beam       0.83    0.12    0.30      0.02
-  -----------  -----------  ---------  --------  --------------------  --------  ------  ------  --------
+  FIRST_IMAGE   LAST_IMAGE   N_IMAGES  ROTATION  REASON                   SEVERITY   SCALE      CC   INDEXED  DISPOSITION  DELTA_CC_HALF  DELTA_CC_HALF_SE
+  -----------  -----------  ---------  --------  -----------------------  --------  ------  ------  --------  -----------  -------------  ----------------
+          500          600        101      10.1  crystal_out_of_beam          0.83    0.12    0.30      0.02  downgraded         +0.0004            0.0031
+          612          630         19       1.9  no_diffraction               0.98    0.02    0.00      0.00  rejected           -0.0481            0.0110
+  -----------  -----------  ---------  --------  -----------------------  --------  ------  ------  --------  -----------  -------------  ----------------
 ```
 
-Of those keys, only `SWEEP_QUALITY_COUNT` is in the default report; `SWEEP_QUALITY_STATUS`,
-`SWEEP_QUALITY_REASONS`, `SWEEP_ROTATION`, `FLUX_PEAK_TO_TROUGH` and
-`SCALE_MODULATION_PEAK_TO_TROUGH` appear with `--developer` (the default report states in prose
-whether the diagnostic ran).
+Of those keys, `SWEEP_QUALITY_COUNT` and the five disposition keys (`FRAMES_MERGED`,
+`FRAMES_DOWNGRADED`, `FRAMES_REJECTED`, `FRAMES_REJECTED_PCT`, `ROTATION_REJECTED_DEG`) are in the
+default report; `SWEEP_QUALITY_STATUS`, `SWEEP_QUALITY_REASONS`, `SWEEP_DISPOSITIONS`,
+`SWEEP_ROTATION`, `FLUX_PEAK_TO_TROUGH` and `SCALE_MODULATION_PEAK_TO_TROUGH` appear with
+`--developer` (the default report states in prose whether the diagnostic ran).
+
+The three frame counts **partition the sweep** — every processed image is exactly one of them and
+they add up to the frame count — so `FRAMES_REJECTED_PCT` is the answer to "how much of this
+experiment was useless". It is reported beside `ROTATION_REJECTED_DEG` on purpose: a percentage of
+*frames* moves when the same experiment is re-sliced, and a percentage of the *rotation* does not.
+The prose headline above the table states both.
 
 `SWEEP_QUALITY_STATUS` distinguishes **`COMPUTED`** (the diagnostic ran; a count of 0 means the sweep
 was clean throughout) from **`NOT_COMPUTED`** (it did not run — no scaling and merging, or stills
@@ -200,9 +226,10 @@ distinguishable from a missing one.
 | `weak_diffraction` | The frames all still index, but with much less intensity — the cause was not determined. |
 | `loss_of_centring` | One cycle of modulation per revolution: the crystal is off the rotation axis. |
 | `radiation_damage` | The range runs to the end of a sweep whose quality was already decaying. |
+| `inconsistent_with_merge` | The frames diffract as the run does, but their intensities do not agree with it — the only evidence is `DELTA_CC_HALF`, so the cause is not named. |
 
 The vocabulary is **closed and stable**: a code is never renamed, and never reused for a different
-meaning. New codes are only ever added, and adding one moves `REPORT_VERSION`.
+meaning. New codes are only ever added, and adding one moves `REPORT_VERSION` at the next release.
 
 The columns are: `FIRST_IMAGE`/`LAST_IMAGE` — inclusive, in processed-image ordinals (the numbering
 of `<prefix>_image.dat` and of every other per-image array `rugnux` writes; with `-s`/`--stride` the
@@ -210,10 +237,104 @@ source image is `start + ordinal * stride`); `ROTATION` — the width of the ran
 `SEVERITY` — the fraction of the run's typical diffracting power missing over the range, 0 (as good
 as the run) to 1 (nothing at all); `SCALE` and `CC` — the range's mean per-image scale and
 CC-to-merge relative to the run median; `INDEXED` — the fraction of the range's frames that were
-scaled at all. Every range also appears as a `WARNING:` sentence in the SUMMARY.
+scaled at all; `DISPOSITION` — what became of it; `DELTA_CC_HALF` and `DELTA_CC_HALF_SE` — what
+keeping it costs the merged intensities, and how precisely that is known. Every range also appears as
+a `WARNING:` sentence in the SUMMARY, with the same cost in words. A range is split where its
+disposition changes, so each row is wholly kept or wholly rejected.
 
-The same finding is written **per image** into the `_process.h5` as `/entry/MX/sweepQuality`, when
-one is written — see [HDF5](HDF5.md#entry-mx-spot-finding-and-indexing-cxi-style).
+### What the disposition means, and what decides it
+
+| Disposition | Meaning |
+|-------------|---------|
+| `merged` | The frame's observations are in the merged data at their own weight. |
+| `downgraded` | They are in the merged data, but over a stretch the run itself flagged, carried at the reduced weight the frame's own scale and sigmas give it. Nothing extra is subtracted: for weak-but-consistent data that reduced weight *is* the honest weight, and a second, invented per-frame weight would double-count with the σ's. |
+| `rejected` | Nothing of the frame reached the merge — because Δ*CC*₁⁄₂ convicted it, because an earlier guard dropped a frame whose scale had collapsed to an unusable number, or because the frame recorded nothing to drop in the first place. To a user asking how much of the experiment was useless these are the same answer, and the `REASON` column separates them. |
+
+`DELTA_CC_HALF` is **Δ*CC*₁⁄₂**: the overall *CC*₁⁄₂ of the merged data **with** the range minus the
+*CC*₁⁄₂ **without** it, evaluated over the reflections the range touches. Negative means keeping the
+range makes the merged intensities worse. It is computed in the σ-τ form — no random half-dataset
+split, so the same input gives the same answer every run — with each reflection's error variance taken
+from the observed scatter of its own observations, not from the error model's σ's (a bad stretch claims
+the same σ's as a good one, so an error-model estimate would read a stretch that adds noise as one that
+adds precision). It is a *CC*₁⁄₂ over **the range's own reflections**, not over the whole dataset — a
+range that touches a few hundred reflections can carry a large Δ*CC*₁⁄₂ without the dataset's headline
+*CC*₁⁄₂ moving by anything like as much. `DELTA_CC_HALF_SE` is the standard error of a *CC*₁⁄₂ on that
+many reflections, in the same units, and a Δ*CC*₁⁄₂ smaller than it says nothing.
+
+A range is rejected only where Δ*CC*₁⁄₂ is **both well below the rest of this run's own batches and
+several standard errors below zero**, and only where **every frame in it is one the per-image channels
+call worse than the run's typical frame** — the scale and the CC to the merge, frame by frame and never
+as an average over the stretch, because an average cannot tell a uniformly bad stretch from a healthy
+arc lying beside a dead one. All three are needed: a healthy crystal merges at
+*CC*₁⁄₂ ≈ 0.999, where a harm of 0.001 in *CC* is already many standard errors, so significance alone
+convicts frames on clean data whose removal moves nothing; and Δ*CC*₁⁄₂ is itself measured against
+the merge, so removing whichever frames disagree with it most improves every agreement statistic
+whether or not anything was wrong with them — the decision has to be triggered by a channel that owes
+nothing to the merge, and only then confirmed by what the merge does. The test runs last, after the per-frame scale, the
+decay slope and the per-batch relative-*B* have been fitted, so it judges corrected data. The decision
+is taken over 10° batches — the same batches as the radiation-damage curve — and over those batches
+doubled, and doubled again, up to a quarter of the sweep: a defect much longer than a batch is
+invisible one batch at a time, because each batch inside it is judged against a merge that still
+contains the rest of the defect. Where the harm lies is then settled finely: each edge of the
+convicted stretch is slid frame by frame with the *whole* stretch re-measured at every position, so
+the range is reported where it actually lies rather than at the batch grid, and the reflection count
+the verdict rests on never shrinks with the edge. Each edge is then pulled back off any frame the
+per-image channels call normal, and what is left has to carry the verdict again on its own: a stretch
+that cannot be taken without healthy frames holds more than one thing and is not removed at all. A rejected
+stretch is never narrower than one rocking event, because the partials of one event are combined into
+the same intensities and inside it no frame can be judged apart from its neighbours. Never more than
+a quarter of the sweep is removed.
+
+**What Δ*CC*₁⁄₂ cannot do**, because the report must not imply otherwise:
+
+- it says nothing about the **cause**: a shutter fault and a crystal that slipped have the identical
+  signature, both integrating background, so the cause comes from the `REASON` column and never from
+  the Δ*CC*₁⁄₂ itself;
+- a **second lattice entering** is invisible to it: those spots were never integrated, so they are not
+  in the merged intensities it measures;
+- a **centring drift that is pure attenuation** reads ≈ 0. That is the right answer, not a blind spot:
+  the data are weak but consistent, the σ's already say so, and their Δ*CC*₁⁄₂ is the evidence that
+  discarding them would cost completeness for nothing;
+- it is attributed to the frame carrying a rocking event's **peak** partial, so it cannot resolve a
+  single frame: a stretch narrower than one rocking event is never rejected, and the edges of a
+  rejected stretch are soft to within half an event;
+- `loss_of_centring` needs ≥ 350° of sweep to be named at all. On a 90° sweep the same drift is still
+  *detected*, only as `crystal_out_of_beam` or `weak_diffraction` — "cause not determined" here means
+  this sweep cannot determine it, not that it is undeterminable.
+
+The same finding is written **per image** into the `_process.h5` as `/entry/MX/sweepQuality` and
+`/entry/MX/frameDisposition`, when one is written — see
+[HDF5](HDF5.md#entry-mx-spot-finding-and-indexing-cxi-style).
+
+## Powder contamination
+
+A crystalline phase other than the crystal, diffracting as rings among its reflections — hexagonal
+ice, a shower of microcrystals, a salt out of the cryoprotectant. It is measured on **every** run, in
+the pre-scan, from the spots found there, and reported whether or not anything acted on it: a user
+whose crystal sat in a powder is told so even where the run indexed perfectly well. Only hexagonal ice
+has rings that can be named in advance, so `POWDER_RINGS_A` is what *this* sample showed.
+
+```
+POWDER_RINGS_DETECTED= TRUE
+POWDER_RING_COUNT= 24
+POWDER_SPOT_FRACTION= 0.412
+POWDER_RINGS_SEPARABLE_TO= 2.31
+POWDER_RINGS_A= 3.897 3.671 3.447 ...
+POWDER_EXCLUDED_FROM_INDEXING= TRUE
+POWDER_INDEXING_D_MIN= 4.91
+```
+
+`POWDER_RINGS_DETECTED` is written on every merging run and is `FALSE` on nearly all of them; the
+rest of the keys appear only where rings were found. `POWDER_SPOT_FRACTION` is the share of the
+pre-scan's spots the rings hold *over* the smooth fall-off around them — what the contaminant
+contributes, not what happens to lie in a ring band. `POWDER_RINGS_SEPARABLE_TO` is the resolution
+past which the rings crowd together too tightly to be told apart, and so the finest an indexing pass
+can be asked to trust on such a pattern; it is absent where they stay separable over the whole range,
+which is the ordinary case. `POWDER_EXCLUDED_FROM_INDEXING` says whether the run needed them
+left out to index at all (with `POWDER_INDEXING_D_MIN` the resolution the retried first pass used).
+Rings are detected far more often than they are excluded: exclusion happens only where a first pass
+found no usable lattice. The measurement is described in
+[CPU/GPU data analysis ▸ Resolution and ice-ring handling](CPU_DATA_ANALYSIS_IMAGE.md#resolution-and-ice-ring-handling).
 
 ## Translational pseudo-symmetry
 
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
index 64170f233..eea1ea74b 100644
--- a/docs/SECURITY.md
+++ b/docs/SECURITY.md
@@ -46,7 +46,7 @@ These controls work and a deployment should apply them (see also `DEPLOYMENT.md`
 
 ### What the software does NOT provide
 
-Be explicit about the gaps so a deployment does not assume protection that is not there:
+The gaps are listed explicitly so a deployment does not assume protection that is not there:
 
 - **No authentication or authorization in the broker.** The HTTP/REST API currently has **no login,
   token, or access control**. Anyone who can reach the broker's host and port has full read access
diff --git a/docs/SOFTWARE.md b/docs/SOFTWARE.md
index 76e5bdbde..0e88324fc 100644
--- a/docs/SOFTWARE.md
+++ b/docs/SOFTWARE.md
@@ -24,25 +24,25 @@ CUDA requirements of each released package.
 Required:
 * C++20 compiler and C++20 standard library; recommended GCC 11+ or clang 14+ (Intel OneAPI, AMD AOCC)
 * CMake version 3.26 or newer + a build tool (GNU make or Ninja)
-* zlib compression library
-* Eigen (header-only linear algebra library), version 3.4.x (the build requests `Eigen3 3.4`, which
-  Eigen's same-major-version rule does not satisfy with 5.x)
 
-HDF5, libtiff and libjpeg-turbo used to be required system packages; they are now downloaded and
-built automatically by CMake (see the note below), so they no longer need to be installed.
+HDF5, libtiff, libjpeg-turbo, zlib and Eigen used to be required system packages; they are now
+downloaded and built automatically by CMake (see the note below), so none of them needs to be
+installed. No third-party library has to be provided by the host any more.
 
 Optional:
 * CUDA compiler version 12.8 or newer - required for the MX fast feedback indexer and GPU analysis
 * FFTW library - for indexing if GPU/CUDA is absent (also auto-downloaded by CMake)
 * Node.js - to build the frontend
 * Qt version 6 (for jfjoch_viewer)
+* OpenSSL 3.0 or newer and the Kerberos development headers (`krb5-devel` / `libkrb5-dev`) -
+  required to build jfjoch_viewer on Linux, where the fetched libcurl uses them for TLS and
+  Negotiate; a build on OpenSSL 1.1 fails in libcurl
 
 Many further dependencies (spdlog, Zstandard, HDF5, slsDetectorPackage, libzmq, libtiff,
 libjpeg-turbo, Ceres, the fast feedback indexer, Catch2, ...) are downloaded automatically
 by CMake and statically linked; building therefore requires network access on the first configure.
-zlib and Eigen are the exception — they must be preinstalled (found via `find_package`); on Windows,
-where they are not present system-wide, install them into a prefix and point `CMAKE_PREFIX_PATH` at
-it (see [Building from source on Windows](JFJOCH_VIEWER.md#building-from-source-on-windows)).
+zlib (as zlib-ng in its zlib-compatible mode) and Eigen are among them: a copy already on the
+machine is used instead if the configure is given `-DZLIB_ROOT=<prefix>` or `-DEigen3_DIR=<dir>`.
 Others are vendored directly in the source tree. The complete list of third-party components, with
 copyright holders, licenses and verbatim license texts, is in
 [Third-party software notices](THIRD_PARTY_NOTICES.md) and the `licenses/` directory.
diff --git a/docs/THIRD_PARTY_NOTICES.md b/docs/THIRD_PARTY_NOTICES.md
index 9d5b1456d..a1b577332 100644
--- a/docs/THIRD_PARTY_NOTICES.md
+++ b/docs/THIRD_PARTY_NOTICES.md
@@ -24,21 +24,35 @@ linked into the Jungfraujoch executables.
 | Component | Version | Copyright | License (SPDX) | License text |
 |---|---|---|---|---|
 | [spdlog](https://github.com/gabime/spdlog) | 1.17.0 | Gabi Melman | MIT | [spdlog.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/spdlog.txt) |
-| [Zstandard](https://github.com/facebook/zstd) | (pinned) | Meta Platforms, Inc. | BSD-3-Clause | [zstd.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/zstd.txt) |
-| [HDF5](https://github.com/HDFGroup/hdf5) | 2.1.0 | The HDF Group; UIUC | BSD-3-Clause-style | [hdf5.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/hdf5.txt) |
+| [Zstandard](https://github.com/facebook/zstd) | 1.5.7 | Meta Platforms, Inc. | BSD-3-Clause | [zstd.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/zstd.txt) |
+| [HDF5](https://github.com/HDFGroup/hdf5) | 2.2.0 | The HDF Group; UIUC | BSD-3-Clause-style + Apache-2.0 | [hdf5.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/hdf5.txt) |
 | [slsDetectorPackage](https://github.com/slsdetectorgroup/slsDetectorPackage) | 8.0.2 / 9.2.0 | PSI | LGPL-3.0-or-later | [LGPL](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/slsDetectorPackage-LGPL-3.0.txt), [GPL](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/slsDetectorPackage-GPL-3.0.txt) |
-| [cpp-httplib](https://github.com/yhirose/cpp-httplib) | 0.39.0 | Yuji Hirose | MIT | [cpp-httplib.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/cpp-httplib.txt) |
+| [cpp-httplib](https://github.com/yhirose/cpp-httplib) | 0.56.0 | Yuji Hirose | MIT | [cpp-httplib.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/cpp-httplib.txt) |
 | [libzmq (ZeroMQ)](https://github.com/zeromq/libzmq) | 4.3.5 | iMatix and contributors | MPL-2.0 | [libzmq.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/libzmq.txt) |
-| [libtiff](https://gitlab.com/libtiff/libtiff) | 4.7.1 | Sam Leffler; SGI | libtiff (BSD-like) | [libtiff.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/libtiff.txt) |
+| [libtiff](https://gitlab.com/libtiff/libtiff) | 4.7.2 | Sam Leffler; SGI | libtiff (BSD-like) | [libtiff.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/libtiff.txt) |
 | [FFTW](https://www.fftw.org/) | 3.3.10 | Matteo Frigo; MIT | GPL-2.0-or-later | [fftw.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/fftw.txt) |
 | [Ceres Solver](https://github.com/ceres-solver/ceres-solver) | (pinned) | Google Inc. and contributors | BSD-3-Clause | [ceres-solver.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/ceres-solver.txt) |
+| [Abseil](https://github.com/abseil/abseil-cpp) | 20250127 (required by Ceres) | Google Inc. | Apache-2.0 | [abseil.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/abseil.txt) |
 | [fast-feedback-indexer](https://github.com/paulscherrerinstitute/fast-feedback-indexer) | (pinned) | PSI | BSD-3-Clause | [fast-feedback-indexer.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/fast-feedback-indexer.txt) |
-| [libjpeg-turbo](https://github.com/libjpeg-turbo/libjpeg-turbo) | (pinned) | D. R. Commander and others; IJG | IJG + BSD-3-Clause + Zlib | [libjpeg-turbo.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/libjpeg-turbo.txt) |
-| [Catch2](https://github.com/catchorg/Catch2) | 3.13.0 | Catch2 Authors | BSL-1.0 | [catch2.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/catch2.txt) |
+| [libjpeg-turbo](https://github.com/libjpeg-turbo/libjpeg-turbo) | 3.2.0 | D. R. Commander and others; IJG | IJG + BSD-3-Clause + Zlib | [libjpeg-turbo.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/libjpeg-turbo.txt) |
+| [curl](https://github.com/curl/curl) | 8.22.0 | Daniel Stenberg and contributors | curl (MIT-like) | [curl.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/curl.txt) |
+| [Catch2](https://github.com/catchorg/Catch2) | 3.16.0 | Catch2 Authors | BSL-1.0 | [catch2.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/catch2.txt) |
+| [zlib-ng](https://github.com/zlib-ng/zlib-ng) | 2.3.3 | Jean-loup Gailly and Mark Adler; the zlib-ng contributors | Zlib | [zlib.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/zlib.txt) |
+| [Eigen](https://gitlab.com/libeigen/eigen) | 3.4.1 | Benoit Jacob, Gael Guennebaud and contributors | MPL-2.0 (+ BSD parts) | [eigen.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/eigen.txt), [README](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/eigen-README.txt) |
+
+libcurl is fetched and statically linked only for viewer builds (`JFJOCH_VIEWER_BUILD` /
+`JFJOCH_VIEWER_ONLY`), where it is `jfjoch_viewer`'s HTTP client; the broker and writer never link
+it. Its TLS and Kerberos backends are the OS-native ones (Schannel/SSPI on Windows, OpenSSL and
+system krb5 on Linux), so no TLS stack is vendored with it.
 
 Catch2 is used only to build the test binary (`jfjoch_test`) and is not part of any shipped
 artifact; it is listed here for completeness.
 
+zlib is supplied by zlib-ng built in its zlib-compatible mode (same `zlib.h`, same API and symbol
+names), so it is the zlib that HDF5, libtiff, cpp-httplib, libcurl and GEMMI all link. It is
+built during the configure rather than added as a subproject; the licence is the zlib licence
+either way. Eigen is header-only: only its headers reach the binaries, and no Eigen CMake runs.
+
 ## Vendored directly in the repository
 
 These are copied into the source tree (see the path) rather than fetched.
@@ -69,8 +83,6 @@ These are copied into the source tree (see the path) rather than fetched.
 |---|---|---|---|
 | [Qt 6](https://www.qt.io/) | `jfjoch_viewer` | LGPL-3.0 | [notice](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/Qt6-NOTICE.txt), [LGPL-3.0](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/Qt6-LGPL-3.0.txt) |
 | [NVIDIA CUDA Toolkit](https://developer.nvidia.com/cuda-toolkit) (cudart, cuFFT) | CUDA builds | NVIDIA CUDA EULA | [notice](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/NVIDIA-CUDA-NOTICE.txt), [EULA](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/NVIDIA-CUDA-EULA.txt) |
-| [zlib](https://zlib.net/) | everywhere (compression) | Zlib | [zlib.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/zlib.txt) |
-| [Eigen](https://gitlab.com/libeigen/eigen) | analysis libs, Ceres, ffbidx (header-only) | MPL-2.0 (+ BSD parts) | [eigen.txt](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/eigen.txt), [README](https://gitea.psi.ch/mx/jungfraujoch/src/branch/main/licenses/eigen-README.txt) |
 
 ## Frontend (npm) dependencies
 
@@ -87,7 +99,7 @@ served frontend, so the shipped web UI carries its own attribution.
 ## Notes on weak-copyleft and attribution-sensitive components
 
 * **MPL-2.0** (Eigen, GEMMI, libzmq, traccc): file-level copyleft. GEMMI is vendored in `gemmi_gph/`
-  in trimmed form; libzmq is fetched at build time; Eigen is provided externally (header-only). The
+  in trimmed form; libzmq and Eigen are fetched at build time (Eigen is header-only). The
   corresponding source is available from each project upstream.
 * **GEMMI's own bundled third-party headers** — PEGTL, sajson, fast_float, half, pocketfft and
   tinydir, all under `gemmi_gph/gemmi/third_party/` — are listed separately above rather than being
diff --git a/docs/conf.py b/docs/conf.py
index 681fe722f..58b4c6d11 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -9,7 +9,7 @@
 project = 'Jungfraujoch'
 copyright = '2024, Paul Scherrer Institute'
 author = 'Filip Leonarski'
-release = '1.0.0-rc.168'
+release = '1.0.0-rc.169'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
diff --git a/docs/python_client/README.md b/docs/python_client/README.md
index e8e9259a3..d826b0afa 100644
--- a/docs/python_client/README.md
+++ b/docs/python_client/README.md
@@ -22,8 +22,8 @@ communicate through network calls or other mechanisms.
 
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.0.0-rc.168
-- Package version: 1.0.0-rc.168
+- API version: 1.0.0-rc.169
+- Package version: 1.0.0-rc.169
 - Generator version: 7.20.0
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
diff --git a/fpga/hdl/action_config.v b/fpga/hdl/action_config.v
index d7f3bf73c..e335393d3 100644
--- a/fpga/hdl/action_config.v
+++ b/fpga/hdl/action_config.v
@@ -10,7 +10,7 @@ localparam signed [31:0] INT32_MIN = 32'sh80000000;
 `define JFJOCH_FPGA_MAJOR_VERSION 8'd1
 `define JFJOCH_FPGA_MINOR_VERSION 8'd0
 `define JFJOCH_FPGA_PATCH_VERSION 8'd0
-`define JFJOCH_FPGA_PRERELEASE 64'h3836312E6372
+`define JFJOCH_FPGA_PRERELEASE 64'h3936312E6372
 
 `define GIT_SHA1 32'h
 `define MAX_MODULES_FPGA 32'd16
diff --git a/fpga/hls/CMakeLists.txt b/fpga/hls/CMakeLists.txt
index d495cee01..94ab47bd0 100644
--- a/fpga/hls/CMakeLists.txt
+++ b/fpga/hls/CMakeLists.txt
@@ -39,7 +39,7 @@ ADD_LIBRARY( JFJochHLSCores STATIC
         ptp.cpp)
 
 TARGET_COMPILE_DEFINITIONS(JFJochHLSCores PUBLIC -DJFJOCH_HLS_NOSYNTH)
-TARGET_INCLUDE_DIRECTORIES(JFJochHLSCores PUBLIC ../include)
+TARGET_INCLUDE_DIRECTORIES(JFJochHLSCores SYSTEM PUBLIC ../include)
 
 IF(VIVADO_HLS)
     IF(NOT HLS_SOLUTION_NAME)
diff --git a/fpga/pcie_driver/dkms.conf b/fpga/pcie_driver/dkms.conf
index c6b5e54c0..c1d2ec9ac 100644
--- a/fpga/pcie_driver/dkms.conf
+++ b/fpga/pcie_driver/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME=jfjoch
-PACKAGE_VERSION=1.0.0-rc.168
+PACKAGE_VERSION=1.0.0-rc.169
 
 DEST_MODULE_LOCATION=/extra
 BUILT_MODULE_NAME=jfjoch
diff --git a/fpga/pcie_driver/install_dkms.sh b/fpga/pcie_driver/install_dkms.sh
index 28bb80032..17b3740e3 100755
--- a/fpga/pcie_driver/install_dkms.sh
+++ b/fpga/pcie_driver/install_dkms.sh
@@ -2,7 +2,7 @@
 
 # Copyright (2019-2024) Paul Scherrer Institute
 
-VERSION=1.0.0-rc.168
+VERSION=1.0.0-rc.169
 
 mkdir -p /usr/src/jfjoch-${VERSION}/src
 cp dkms.conf /usr/src/jfjoch-${VERSION}
diff --git a/fpga/pcie_driver/jfjoch_drv.c b/fpga/pcie_driver/jfjoch_drv.c
index c26f311de..67634854e 100644
--- a/fpga/pcie_driver/jfjoch_drv.c
+++ b/fpga/pcie_driver/jfjoch_drv.c
@@ -12,7 +12,7 @@
 MODULE_AUTHOR("Filip Leonarski; Paul Scherrer Institute");
 MODULE_DESCRIPTION("Jungfraujoch device module");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("1.0.0-rc.168");
+MODULE_VERSION("1.0.0-rc.169");
 
 #define PCI_DEV_ID_JUNGFRAUJOCH        (0x3450)
 
diff --git a/fpga/pcie_driver/postinstall.sh b/fpga/pcie_driver/postinstall.sh
index e1acf159c..be40e46f3 100755
--- a/fpga/pcie_driver/postinstall.sh
+++ b/fpga/pcie_driver/postinstall.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Taken from https://schneide.blog/2015/08/10/packaging-kernel-modulesdrivers-using-dkms/
 
-VERSION=1.0.0-rc.168
+VERSION=1.0.0-rc.169
 
 occurrences=`/usr/sbin/dkms status | grep jfjoch | grep ${VERSION} | wc -l`
 
diff --git a/fpga/pcie_driver/preuninstall.sh b/fpga/pcie_driver/preuninstall.sh
index bd136f9b2..ef42d5242 100755
--- a/fpga/pcie_driver/preuninstall.sh
+++ b/fpga/pcie_driver/preuninstall.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Taken from https://schneide.blog/2015/08/10/packaging-kernel-modulesdrivers-using-dkms/
 
-VERSION=1.0.0-rc.168
+VERSION=1.0.0-rc.169
 
 /usr/sbin/dkms remove -m jfjoch -v ${VERSION} --all
 
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 6f4c9358c..7e825ac22 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "jungfraujoch-frontend",
-  "version": "1.0.0-rc.168",
+  "version": "1.0.0-rc.169",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "jungfraujoch-frontend",
-      "version": "1.0.0-rc.168",
+      "version": "1.0.0-rc.169",
       "license": "GPL-3.0",
       "dependencies": {
         "@emotion/react": "^11.10.4",
diff --git a/frontend/package.json b/frontend/package.json
index f5be377e9..f415d7fe6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jungfraujoch-frontend",
-  "version": "1.0.0-rc.168",
+  "version": "1.0.0-rc.169",
   "license": "GPL-3.0",
   "private": true,
   "homepage": "/frontend",
diff --git a/frontend/src/version.ts b/frontend/src/version.ts
index 2ea5ee565..ac4297364 100644
--- a/frontend/src/version.ts
+++ b/frontend/src/version.ts
@@ -1 +1 @@
-export const JFJOCH_VERSION : string = "1.0.0-rc.168";
\ No newline at end of file
+export const JFJOCH_VERSION : string = "1.0.0-rc.169";
\ No newline at end of file
diff --git a/image_analysis/CMakeLists.txt b/image_analysis/CMakeLists.txt
index 2bf22bd3a..4e01b85d3 100644
--- a/image_analysis/CMakeLists.txt
+++ b/image_analysis/CMakeLists.txt
@@ -26,21 +26,56 @@ SET(EIGENMETIS  OFF CACHE BOOL "Ceres: METIS ordering only applies to sparse fac
 SET(CMAKE_DISABLE_FIND_PACKAGE_MKL TRUE)
 SET(CERES_THREADING_MODEL "CXX_THREADS")
 
+# Ceres is the only dependency that needs more than a plain tarball: it carries abseil as a git
+# SUBMODULE, so a source archive leaves third_party/abseil-cpp empty. Ceres tests exactly that
+# directory and, finding it empty, demands find_package(absl REQUIRED 20240116) instead -- which no
+# build image can satisfy (Ubuntu 24.04 still ships 20230802). So populate the two archives
+# separately and hand Ceres the tree a submodule checkout would have produced: abseil unpacked into
+# third_party/abseil-cpp, and only then the subdirectory added.
+#
+# Populate-then-add rather than FetchContent_MakeAvailable(ceres), because MakeAvailable populates
+# and add_subdirectory()s in one step, leaving no window to fill the submodule -- and the URL
+# population clears its source directory, so abseil cannot be put there beforehand.
+#
+# FetchContent_Populate(<name>) is deprecated from CMake 3.30 (CMP0169) in favour of the
+# MakeAvailable that cannot be used here, so ask for the old behaviour rather than let every build
+# on a newer CMake print the deprecation.
+IF (POLICY CMP0169)
+    CMAKE_POLICY(PUSH)
+    CMAKE_POLICY(SET CMP0169 OLD)
+ENDIF()
+
 FetchContent_Declare(
         ceres
-        GIT_REPOSITORY https://github.com/ceres-solver/ceres-solver
-        GIT_TAG 0c70ed3
-        EXCLUDE_FROM_ALL
+        URL https://github.com/ceres-solver/ceres-solver/archive/0c70ed3a1a2d6ba47c06c7e8b3b040880bc474db.tar.gz
+        URL_HASH SHA256=bf0bcc78fae884e59dd893693e52510da7cc6866a7444fdae9ba8f19eae266cd
 )
+FetchContent_Populate(ceres)
 
-FetchContent_MakeAvailable(ceres)
+# The exact commit Ceres' submodule points at (abseil lts_2025_01_27), so the tree matches what a
+# recursive clone of the pinned Ceres would have checked out.
+FetchContent_Declare(
+        abseil
+        URL https://github.com/abseil/abseil-cpp/archive/9ac7062b1860d895fb5a8cbf58c3e9ef8f674b5f.tar.gz
+        URL_HASH SHA256=fd5062972ac6c5575bc8fb6fb1cd6e7c563730be96be4c17b8dcca74a9c5892d
+        SOURCE_DIR "${ceres_SOURCE_DIR}/third_party/abseil-cpp"
+)
+FetchContent_Populate(abseil)
+
+IF (POLICY CMP0169)
+    CMAKE_POLICY(POP)
+ENDIF()
+
+ADD_SUBDIRECTORY("${ceres_SOURCE_DIR}" "${ceres_BINARY_DIR}" EXCLUDE_FROM_ALL)
 
 # Ceres asks for Eigen with a version RANGE -- find_package(Eigen3 3.3.4...5 NO_MODULE) -- and
 # Eigen's own Eigen3ConfigVersion.cmake rejects any range whose two endpoints differ in major
 # version. A 3.4 Eigen therefore reports itself INCOMPATIBLE with Ceres' query and the search falls
 # through to whatever older Eigen comes next on the prefix path (a distro eigen3-devel, say). Having
 # resolved Eigen above, Ceres inherits our Eigen3::Eigen instead, because a generated targets file
-# returns early when its targets already exist. If that ever stops holding, Ceres compiles against
+# returns early when its targets already exist. (The config package the top-level CMakeLists writes
+# for the bundled Eigen answers the range as well, so with it Ceres' own query simply succeeds --
+# but an externally provided Eigen still behaves as described.) If that ever stops holding, Ceres compiles against
 # one Eigen and the rest of the project against another; the two versions' identically mangled
 # template instantiations are then merged at link time -- an ODR violation whose symptom is a crash
 # inside Eigen. Refuse to build it.
diff --git a/image_analysis/IndexAndRefine.cpp b/image_analysis/IndexAndRefine.cpp
index 67c969705..39e42da2b 100644
--- a/image_analysis/IndexAndRefine.cpp
+++ b/image_analysis/IndexAndRefine.cpp
@@ -67,7 +67,6 @@ IndexAndRefine::IndexAndRefine(const DiffractionExperiment &x, IndexerThreadPool
     : retain_outcomes_(retain_outcomes),
       real_time(real_time),
       experiment(x),
-      geom_(x.GetDiffractionGeometry()),
       indexer_(indexer),
       rotation_indexer_counter(x) {
     if (indexer && x.IsRotationIndexing())
@@ -161,12 +160,18 @@ IndexAndRefine::IndexingOutcome IndexAndRefine::DetermineLatticeAndSymmetry(Data
     // Read per call rather than cached at construction: the run measures for itself whether the
     // crystal has ice, and that verdict lands after this object is built.
     const bool index_ice_rings = experiment.GetIndexingSettings().GetIndexIceRings();
+    // Read per call, for the same reason: a beam-centre hypothesis moves the geometry after this
+    // object is built, and a spot mapped into reciprocal space through the centre the run started at
+    // is not the spot the trial centre sees. Held at construction, this scored every hypothesis of the
+    // beam-centre ladder against the file's geometry - which is why a centre scored 42/60 inside the
+    // ladder and 5/60 when the same value was given on the command line.
+    const DiffractionGeometry geom = experiment.GetDiffractionGeometry();
     for (size_t seed_cap : {size_t{30}, size_t{80}, std::numeric_limits<size_t>::max()}) {
         std::vector<Coord> recip;
         recip.reserve(std::min<size_t>(seed_cap, msg.spots.size()));
         for (const auto &i: msg.spots) {
             if (index_ice_rings || !i.ice_ring) {
-                recip.push_back(i.ReciprocalCoord(geom_));
+                recip.push_back(i.ReciprocalCoord(geom));
                 if (recip.size() >= seed_cap)
                     break;
             }
@@ -223,7 +228,7 @@ IndexAndRefine::IndexingOutcome IndexAndRefine::DetermineLatticeAndSymmetry(Data
         recip.reserve(std::min<size_t>(msg.spots.size(), FFT_MAX_SPOTS));
         for (const auto &i : msg.spots) {
             if (index_ice_rings || !i.ice_ring) {
-                recip.push_back(i.ReciprocalCoord(geom_));
+                recip.push_back(i.ReciprocalCoord(geom));
                 if (recip.size() >= FFT_MAX_SPOTS)
                     break;
             }
@@ -603,7 +608,8 @@ void IndexAndRefine::QuickPredictAndIntegrate(DataMessage &msg,
 }
 
 std::optional<IndexAndRefine::IndexingOutcome>
-IndexAndRefine::DetermineRefineAnalyze(DataMessage &msg, const SpotFindingSettings &spot_finding_settings) {
+IndexAndRefine::DetermineRefineAnalyze(DataMessage &msg, const SpotFindingSettings &spot_finding_settings,
+                                      int64_t *spots_on_lattice) {
     if (!indexer_ || !spot_finding_settings.indexing)
         return std::nullopt;
 
@@ -625,7 +631,8 @@ IndexAndRefine::DetermineRefineAnalyze(DataMessage &msg, const SpotFindingSettin
 
     // AnalyzeIndexing answers "is this frame worth integrating"; msg.indexing_result carries the
     // stricter "does this frame index on its own", which on rotation is not the same question.
-    if (!AnalyzeIndexing(msg, outcome.experiment, *outcome.lattice_candidate, outcome.extra_lattice_candidates))
+    if (!AnalyzeIndexing(msg, outcome.experiment, *outcome.lattice_candidate, outcome.extra_lattice_candidates,
+                         spots_on_lattice))
         return std::nullopt;
 
     {
@@ -653,6 +660,12 @@ bool IndexAndRefine::IndexFrameOnly(DataMessage &msg, const SpotFindingSettings
            && msg.indexing_result.value_or(false);
 }
 
+int64_t IndexAndRefine::CountSpotsOnLattice(DataMessage &msg, const SpotFindingSettings &spot_finding_settings) {
+    int64_t spots_on_lattice = 0;
+    DetermineRefineAnalyze(msg, spot_finding_settings, &spots_on_lattice);
+    return spots_on_lattice;
+}
+
 std::optional<RotationIndexerResult> IndexAndRefine::FinalizeRotationIndexing() {
     if (rotation_indexer) {
         if (const auto latt = rotation_indexer->GetLattice())
@@ -664,6 +677,14 @@ std::optional<RotationIndexerResult> IndexAndRefine::FinalizeRotationIndexing()
     return {};
 }
 
+std::optional<RotationIndexer::ConstrainedRefit>
+IndexAndRefine::RefineRotationLatticeConstrained(const CrystalLattice &latt,
+                                                 gemmi::CrystalSystem system) const {
+    if (!rotation_indexer)
+        return {};
+    return rotation_indexer->RefineConstrained(latt, system);
+}
+
 IndexAndRefine &IndexAndRefine::ReferenceIntensities(std::vector<MergedReflection> &reference) {
     // An external reference is trusted to be in the correct hand, so use it to break the merohedral
     // indexing ambiguity per image (serial stills index each crystal independently).
diff --git a/image_analysis/IndexAndRefine.h b/image_analysis/IndexAndRefine.h
index 3a81173ba..ec901ea27 100644
--- a/image_analysis/IndexAndRefine.h
+++ b/image_analysis/IndexAndRefine.h
@@ -36,7 +36,6 @@ class IndexAndRefine {
     const bool retain_outcomes_;
     const bool real_time;   // see the constructor
     const DiffractionExperiment& experiment;
-    const DiffractionGeometry geom_;
 
     std::optional<CrystalLattice> indexed_lattice;
 
@@ -96,7 +95,8 @@ class IndexAndRefine {
     // real per-image ProcessImage and the first-pass scheme validation go through this, so they cannot
     // diverge.
     std::optional<IndexingOutcome> DetermineRefineAnalyze(DataMessage &msg,
-                                                          const SpotFindingSettings &spot_finding_settings);
+                                                          const SpotFindingSettings &spot_finding_settings,
+                                                          int64_t *spots_on_lattice = nullptr);
     void RefineGeometryIfNeeded(DataMessage &msg, IndexingOutcome &outcome);
     void QuickPredictAndIntegrate(DataMessage &msg,
                                  const SpotFindingSettings &spot_finding_settings,
@@ -137,12 +137,22 @@ public:
     // Index a single frame (no integration) with the current forced rotation lattice; used to score
     // first-pass sampling schemes on the real per-image path. Returns whether the frame indexed.
     bool IndexFrameOnly(DataMessage &msg, const SpotFindingSettings &settings);
+    // How many of this frame's spots lie on the forced rotation lattice, whatever the per-frame gate
+    // then makes of them. The first pass's acceptance test counts spots over the validation set rather
+    // than frames, so it needs the count from the sparse frames IndexFrameOnly refuses too.
+    int64_t CountSpotsOnLattice(DataMessage &msg, const SpotFindingSettings &settings);
     IndexAndRefine& ReferenceIntensities(std::vector<MergedReflection> &reference);
 
     ScalingResult ScaleAllImages(const std::vector<MergedReflection> &reference, size_t nthreads = 0);
 
     std::optional<RotationIndexerResult> FinalizeRotationIndexing();
 
+    // Re-refine a lattice with its metric constrained to one crystal system, against the rotation
+    // indexing's own accumulated spots - for a caller that has adopted a symmetry the indexing never
+    // refined under. Empty for a run with no rotation indexer. See RotationIndexer::RefineConstrained.
+    [[nodiscard]] std::optional<RotationIndexer::ConstrainedRefit>
+    RefineRotationLatticeConstrained(const CrystalLattice &latt, gemmi::CrystalSystem system) const;
+
     std::optional<UnitCell> GetConsensusUnitCell() const;
 
     // Not thread safe, need to be run after processing is all done
diff --git a/image_analysis/WriteReflections.cpp b/image_analysis/WriteReflections.cpp
index 75faba113..2a7b6a4c4 100644
--- a/image_analysis/WriteReflections.cpp
+++ b/image_analysis/WriteReflections.cpp
@@ -733,7 +733,7 @@ void WriteUnmergedMtzReflections(const std::vector<IntegrationOutcome> &outcomes
     ds.wavelength = experiment.GetWavelength_A();
 
     // Every data column belongs to HKL_base and only the batches carry a dataset id, as in a
-    // POINTLESS file. Down to FLAG this is POINTLESS's own column set, plus QE; the four after it
+    // POINTLESS file. Down to FLAG this is POINTLESS's own column set, plus QE and FLIGHT; the four after it
     // are what rugnux measures beyond it - the offset of the reflection from the centre of its
     // rocking curve, the Lorentz geometry of that curve, and the background that was subtracted.
     //
@@ -787,10 +787,11 @@ void WriteUnmergedMtzReflections(const std::vector<IntegrationOutcome> &outcomes
     // crystal-frame information careless scales on, and what makes the file unmerged rather than a
     // merge waiting to happen.
     // I and SIGI are the integrated intensity with every deterministic per-reflection correction
-    // applied and nothing else, which is what IOBS means in every unmerged format. Two columns
-    // record what was applied, so the raw count sum is recoverable exactly as I / LP * QE:
-    // LP is Lorentz x polarization and QE the sensor efficiency (a divisor, hence the multiply).
-    // Neither is a scale, and a program that reads this file has no way to recompute them. The
+    // applied and nothing else, which is what IOBS means in every unmerged format. Three columns
+    // record what was applied, so the raw count sum is recoverable exactly as I / LP * QE * FLIGHT:
+    // LP is Lorentz x polarization, QE the sensor efficiency and FLIGHT the attenuation of the
+    // flight-path medium (both divisors, hence the multiplies).
+    // None of the three is a scale, and a program that reads this file has no way to recompute them. The
     // partiality is NOT divided out - that IS a scale, FRACTIONCALC carries it, and every program
     // this file is for wants to handle it its own way.
     gemmi::UnmergedHklMover hkl_mover(mtz.spacegroup);
diff --git a/image_analysis/WriteReflections.h b/image_analysis/WriteReflections.h
index 9b439f3d0..a6c59010e 100644
--- a/image_analysis/WriteReflections.h
+++ b/image_analysis/WriteReflections.h
@@ -56,10 +56,11 @@ void WriteShelxHklReflections(const std::vector<MergedReflection> &reflections,
 // rotation program writes, over the events the combine would assemble (--min-partiality). False
 // writes one row per integrated box instead, flagged as partials for the reading program to sum.
 // Stills have no rocking events and are unaffected either way.
-// The intensities carry the deterministic per-reflection corrections and nothing else - Lorentz,
-// polarization and the sensor's angle-dependent efficiency, recorded in the LP and QE columns, so
-// raw counts are I / LP * QE. The partiality and the per-image scale are left for the reading
-// program to fit, since every program this file is for fits a scale model of its own.
+// The intensities carry the deterministic per-reflection corrections and nothing else - Lorentz
+// and polarization in LP, the sensor's angle-dependent efficiency in QE, and the attenuation of the
+// flight-path medium in FLIGHT - so raw counts are I / LP * QE * FLIGHT. The partiality and the
+// per-image scale are left for the reading program to fit, since every program this file is for
+// fits a scale model of its own.
 void WriteUnmergedMtzReflections(const std::vector<IntegrationOutcome> &outcomes,
                                  const UnitCell &unitCell,
                                  const DiffractionExperiment &experiment,
diff --git a/image_analysis/beam_stop/SHADOW_FINDER.md b/image_analysis/beam_stop/SHADOW_FINDER.md
index 12ae4d1ec..69df8e270 100644
--- a/image_analysis/beam_stop/SHADOW_FINDER.md
+++ b/image_analysis/beam_stop/SHADOW_FINDER.md
@@ -1,9 +1,9 @@
 # Beam-stop shadow finder
 
-`ShadowFinder` detects the beam-stop shadow — the central **disk** plus its **holder arm** —
-from a small number of images, and returns a per-pixel mask of the shadowed region. It exists
-so the pipeline can mask the beam stop **automatically** instead of relying on a hand-drawn user
-mask.
+`ShadowFinder` detects shadowed detector regions — the beam stop's central **disk** and **holder
+arm**, and any other hardware standing in the beam, such as a pin or a loop — from a small number
+of images, and returns a per-pixel mask of the shadowed region. It exists so the pipeline can mask
+them **automatically** instead of relying on a hand-drawn user mask.
 
 It is written in the accumulate-then-finalize shape of `DarkMaskAnalysis`: feed frames with
 `AddImage()`, then read the mask once with `GetMask()`. It is built as part of
@@ -19,6 +19,7 @@ ShadowFinder finder(experiment);                 // geometry (beam centre, conve
 std::vector<uint8_t> scratch;
 for (int i : first_N_frames)                      // ~20–50 spread frames is plenty (see below)
     finder.AddImage(read_frame(i), scratch);      // DataMessage with .image, like DarkMaskAnalysis
+finder.BeamCenter(x, y);                          // optional: the measured centre, not the file's
 std::vector<uint32_t> shadow = finder.GetMask();  // 1 = shadow, 0 = keep; converted geometry
 ```
 
@@ -43,33 +44,60 @@ own radius**, not to a global threshold.
 1. **Projection.** Per pixel accumulate the **max** and the **mean** (sum + count) over the added
    frames, skipping the no-data sentinel. The stop is stationary, so it stays dark while spots and
    the air-scatter halo build up around it.
-2. **Robust radial baseline.** Take the **median of the mean-projection in each 1-pixel ring**
+2. **Polarization.** The background is not flat around a ring even with nothing in the beam: a
+   polarized source suppresses it in its own plane by `1 - sin^2(2 theta)`, which is a factor of
+   three at `2 theta = 55 deg` and four at 70 deg — several times the dip being looked for, so on a
+   short-distance geometry the two horizontal lobes of every outer ring read as shadow. The mean is
+   therefore divided by the Kahn factor before the comparison, read off the experiment's own
+   geometry so that detector tilt, a quarter-turned image and an in-plane rotation all move the
+   polarization plane correctly, about the centre named in step 3. It is the **only** correction a
+   ring carries that varies along it — solid angle, detector and air absorption are functions of
+   `2 theta` alone and the ring's own median absorbs them. The Poisson test of step 5 puts the
+   factor back, so the significance is still the significance of the counts that were recorded.
+   Nothing is corrected when the experiment states no polarization.
+3. **Robust radial baseline.** Take the **median of the mean-projection in each 1-pixel ring**
    about the beam centre. The median ignores the shadow (a minority of each ring) and the spots.
    Iterate 3×, excluding the shadow it finds, so the baseline is not pulled down by the shadow.
-3. **Ratio.** `ratio = mean / baseline(r)`. Shadowed pixels sit far below 1; the smooth halo and
+   The rings are drawn about the centre the caller names with `BeamCenter()`, which defaults to the
+   file's. Tens of pixels of error cost nothing, but a couple of hundred draws the rings across the
+   background's own fall-off instead of along it and a large region then reads as shadow for
+   reasons that have nothing to do with hardware — so `rugnux` fits the centre from this same
+   projection first and names that one (see below).
+4. **Ratio.** `ratio = mean / baseline(r)`. Shadowed pixels sit far below 1; the smooth halo and
    symmetric ice rings cancel to ≈1 and are **not** flagged.
-4. **Core + connectivity.** `core = ratio < shadow_ratio`, then keep only the part **connected to
-   the beam centre** (flood from a small central seed through a `bridge_px`-dilated copy, so the
-   arm crosses module gaps). The centre anchor is what makes it specific to the beam stop rather
-   than any random low patch.
-5. **Reflection guard.** A pixel whose **max**-projection reached `min_reflection` recorded a real
+5. **Counting statistics.** A ratio on its own says nothing when the background it is made of is a
+   handful of photons, so the deficit is also required to be significant against its own Poisson
+   scatter: `sigma = sqrt(2 (E - N + N ln(N/E)))` for the pooled counts `N` observed against the
+   `E` the ring expects, cut at `min_deficit_sigma`. This is what makes the test scale-free — a
+   third of the background missing is overwhelming on a well-exposed sweep and is noise on six
+   low-background frames, and without it such a pre-scan masks three quarters of a detector.
+6. **Core + size.** `core = ratio < shadow_ratio && sigma > min_deficit_sigma`, then keep only
+   components holding at least `min_shadow_pixels` core pixels (components taken through a
+   `bridge_px`-dilated copy, so the arm crosses module gaps). **Nothing anchors the region to the
+   beam centre**: hardware that shadows the detector need not touch the direct beam, and a pin or a
+   loop typically does not — it begins some way out in radius with lit detector between it and the
+   stop, which an anchored search discards however deep it is. Size is what makes the test specific
+   instead; the background wanders a pixel or two at a time, hardware does not.
+7. **Reflection guard.** A pixel whose **max**-projection reached `min_reflection` recorded a real
    reflection — a beam stop cannot block a reflection that was measured — so it is **never masked**
    (a small-cluster test drops single-pixel zingers).
-6. **Central disk (low-res guard).** From the azimuthal **blocked fraction** about the beam centre,
-   mask a full disk out to the radius where nearly every azimuth is blocked (a disk blocks all
-   directions; a thin arm/gap does not). Returns nothing when the centre is not behind a disk, and
-   is **capped just inside the innermost reflection** so a real edge spot is never swallowed. This
-   guards the low-resolution zone the stop makes un-measurable, including a disk the raw data has
-   already voided.
-7. **Soft boundary.** Grow the core+disk into partially-shadowed pixels (`ratio < penumbra_ratio`)
+8. **Central disk (low-res guard).** Inside the stop a whole ring is blocked, so its own median is
+   blocked too and step 4 has nothing to compare against. Walking outward, every ring whose
+   background is below `blocked_ring_ratio` of **what this detector's background typically is** -
+   the median over the rings the walk is willing to judge - lies wholly inside the stop and is
+   shadow in its entirety. The comparison is deliberately **not** against the largest background
+   further out: a sample whose background peaks in a strong ring away from the beam (a powder
+   standard, a strong solvent ring) then reads as a stop the size of that ring.
+9. **Soft boundary.** Grow the core+disk into partially-shadowed pixels (`ratio < penumbra_ratio`)
    within `penumbra_max_px`, then a morphological close rounds the contour and hole-filling closes
    the disk interior.
-8. **Carve reflections last.** Remove any lit pixel from the final mask (no fill afterwards) so a
+10. **Carve reflections last.** Remove any lit pixel from the final mask (no fill afterwards) so a
    spot the geometry still covered is given back rather than re-enclosed.
 
-Three findings from the prototype are baked in: the **mean** ratio (not the max) does the
-detecting — the max projection is a great *picture* but a noisier detector; the **centre anchor**
-is what distinguishes the stop from stray low patches; and **a lit pixel is never masked**.
+Three findings are baked in: the **mean** ratio (not the max) does the detecting — the max
+projection is a great *picture* but a noisier detector; **size and counting statistics**, not a
+position, are what distinguish hardware from a stray low patch; and **a lit pixel is never
+masked**.
 Detection converges in **~2–3 frames** (the shadow cuts the halo present in every frame); 20–50 is
 just safe headroom.
 
@@ -77,9 +105,11 @@ just safe headroom.
 
 | field | default | meaning |
 |---|---|---|
-| `shadow_ratio` | 0.35 | core threshold: mean below this fraction of the radial baseline |
-| `penumbra_ratio` | 0.72 | soft boundary grows out to this ratio … |
-| `penumbra_max_px` | 14 | … but no further than this from the core |
+| `shadow_ratio` | 0.50 | core threshold: mean below this fraction of the radial baseline |
+| `min_deficit_sigma` | 6 | … and the deficit significant to this many Poisson standard deviations |
+| `min_shadow_pixels` | 2000 | smallest region the per-pixel test may return |
+| `penumbra_ratio` | 0.75 | soft boundary grows out to this ratio … |
+| `penumbra_max_px` | 30 | … but no further than this from the core |
 | `bridge_px` | 6 | bridge module gaps / breaks the arm crosses |
 | `min_reflection` | 25 | max-projection value at/above which a pixel is a protected reflection |
 
@@ -136,6 +166,18 @@ beam-stop mask is an **offline** (Rugnux + viewer) feature and never goes to the
 - **Off-centre disk**: the low-res disk guard keys on the *stored* beam centre. If that is off the
   physical stop (seen on one stills detector), a small already-dead disk gets no extra circular
   guard — a data-driven disk centre would close it.
+- **A grossly wrong beam centre**: closed in `rugnux` by ordering. The centre is fitted from the
+  projection *before* the mask is read, and named with `BeamCenter()`; the shadow that biases that
+  fit moves it by a few pixels, three orders below what the ring comparison notices. What remains
+  is the case where the fit declines to place a centre at all, where the file's is used as before.
+  Another caller that reads the mask at the file's centre keeps the old exposure.
+- **The polarization plane is taken from the experiment, not measured.** The correction follows
+  `DiffractionGeometry::CalcAzIntPolarizationCorr`, which fixes the plane on the lab x axis and
+  expresses a vertically polarized source as a negative coefficient — the same assumption azimuthal
+  integration already makes, so a beamline where it is wrong is wrong there first. Measured over the
+  corpus the plane sits within a degree of lab x on every dataset, and the amplitude within tens of
+  per cent of the prediction, which is far inside the margin the 0.50 threshold leaves. An
+  experiment that states no polarization is left uncorrected, as before.
 - **Unsigned saturation**: for unsigned images a detector-saturating reflection collides with the
   no-data sentinel and is skipped; harmless in practice (such reflections do not sit under the
   stop), and absent entirely on the signed/preprocessed path.
diff --git a/image_analysis/beam_stop/ShadowFinder.cpp b/image_analysis/beam_stop/ShadowFinder.cpp
index c40e484f5..28bb9f695 100644
--- a/image_analysis/beam_stop/ShadowFinder.cpp
+++ b/image_analysis/beam_stop/ShadowFinder.cpp
@@ -20,12 +20,13 @@
 
 // A pixel is shadow when its background is below this fraction of the background it is
 // compared against.
-constexpr float SHADOW_RATIO = 0.35f;
+constexpr float SHADOW_RATIO = 0.50f;
 
 // The boundary grows outward into partially shadowed pixels down to this fraction, but no
-// further than PENUMBRA_MAX_PX from the core.
-constexpr float PENUMBRA_RATIO = 0.72f;
-constexpr int   PENUMBRA_MAX_PX = 14;
+// further than PENUMBRA_MAX_PX from the core. A pin or a loop casts a wide half-shadow, so the
+// reach is a good deal more than the beam stop's own edge needs.
+constexpr float PENUMBRA_RATIO = 0.75f;
+constexpr int   PENUMBRA_MAX_PX = 30;
 
 // Bridge module gaps and small breaks that the holder arm crosses.
 constexpr int BRIDGE_PX = 6;
@@ -34,10 +35,18 @@ constexpr int BRIDGE_PX = 6;
 // beam stop cannot block a reflection that was measured.
 constexpr int64_t MIN_REFLECTION = 25;
 
-// Counts the background must have accumulated over the frames and the pooled pixels before
-// a dip in it is believable. Below this a Poisson hole is indistinguishable from a shadow,
-// and testing anyway masks whole detectors on low-background data.
-constexpr double MIN_EXPECTED_COUNTS = 60;
+// How far below the background it is compared against a pixel must sit before the dip is
+// believed, in standard deviations of the counts that back it. The counts are photons, so their
+// scatter is Poisson and the deficit is measured against it rather than against a fixed number:
+// on a well-exposed sweep a third of the background missing is overwhelming, and on a handful of
+// low-background frames the same third is noise. Without this a six-frame pre-scan of a
+// low-background sweep masks three quarters of the detector.
+constexpr double MIN_DEFICIT_SIGMA = 6.0;
+
+// Smallest region the per-pixel test may return. A shadow is cast by something physical and is
+// correspondingly large; an isolated patch this small is the background wandering, not hardware.
+// This is what keeps the test specific now that a shadow no longer has to touch the direct beam.
+constexpr int MIN_SHADOW_PIXELS = 2000;
 
 // Side of the box the background is pooled over before testing. Its area is how many pixels back
 // a ring's countability test, which decides where an azimuthal comparison is possible at all.
@@ -47,10 +56,25 @@ constexpr double MEAN_POOLED_PIXELS = POOL_PX * POOL_PX;
 // A ring with fewer valid pixels than this says nothing about whether it was counted.
 constexpr int MIN_RING_PIXELS = 32;
 
+// A ring lies wholly inside the stop when its background is below this fraction of the background
+// further out. This asks about a whole ring rather than about a pixel, so it keeps a threshold of
+// its own and does not follow SHADOW_RATIO.
+constexpr float BLOCKED_RING_RATIO = 0.35f;
+
 // Binary-image helpers on a width*height frame stored row-major as char (0/1). All run once,
 // at GetMask() time; the BFS forms keep them O(pixels) rather than O(pixels * radius).
 namespace {
 
+// Deficit of an observed count against its expectation, in standard deviations, from the Poisson
+// likelihood ratio. Zero when the observation is not below the expectation.
+double poisson_deficit_sigma(double observed, double expected) {
+    if (expected <= 0.0 || observed >= expected)
+        return 0.0;
+    const double ll = 2.0 * (expected - observed
+                             + (observed > 0.0 ? observed * std::log(observed / expected) : 0.0));
+    return ll > 0.0 ? std::sqrt(ll) : 0.0;
+}
+
 // 8-connected dilation by `r` pixels, i.e. every pixel within Chebyshev distance r of a set one.
 //
 // This was a multi-source BFS, which is what the distance is defined by - but on a full rectangle
@@ -122,27 +146,6 @@ std::vector<char> erode(const std::vector<char> &in, int W, int H, int r, size_t
     return out;
 }
 
-// Pixels of `passable` reachable from any of `seeds` (8-connected flood).
-std::vector<char> flood(const std::vector<char> &passable, int W, int H, const std::vector<int> &seeds) {
-    std::vector<char> visited(passable.size(), 0);
-    std::queue<int> q;
-    for (const int s : seeds)
-        if (passable[s] && !visited[s]) { visited[s] = 1; q.push(s); }
-    while (!q.empty()) {
-        const int i = q.front(); q.pop();
-        const int y = i / W, x = i % W;
-        for (int dy = -1; dy <= 1; dy++)
-            for (int dx = -1; dx <= 1; dx++) {
-                const int yy = y + dy, xx = x + dx;
-                if (yy < 0 || yy >= H || xx < 0 || xx >= W)
-                    continue;
-                const int j = yy * W + xx;
-                if (passable[j] && !visited[j]) { visited[j] = 1; q.push(j); }
-            }
-    }
-    return visited;
-}
-
 // Fill holes: background not reachable from the image border becomes region.
 //
 // The flood is run over the bounding box of `region` grown by one, not the whole detector. Outside
@@ -287,6 +290,8 @@ ShadowFinder::ShadowFinder(const DiffractionExperiment &experiment, const PixelM
       height(static_cast<int>(experiment.GetYPixelsNumConv())),
       beam_x(experiment.GetBeamX_pxl()),
       beam_y(experiment.GetBeamY_pxl()),
+      geometry(experiment.GetDiffractionGeometry()),
+      polarization(experiment.GetPolarizationFactor()),
       pixel_mask(mask.GetMask(experiment)) {
     if (pixel_mask.size() != static_cast<size_t>(width) * height)
         throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
@@ -302,6 +307,12 @@ ShadowFinder::ShadowFinder(const DiffractionExperiment &experiment, const PixelM
 #endif
 }
 
+void ShadowFinder::BeamCenter(float x, float y) {
+    std::unique_lock ul(m);
+    beam_x = x;
+    beam_y = y;
+}
+
 // A shard's accumulators are allocated when a frame is first added to it, not here: with a GPU they
 // are never used at all, and on a 16 Mpx detector eight of them are 2.9 GB to allocate and clear -
 // which measured 0.8 s of the pre-scan, all of it wasted.
@@ -519,8 +530,17 @@ std::vector<uint32_t> ShadowFinder::GetMask(size_t nthreads) const {
     if (frames == 0)
         return mask;
 
-    // mean projection, usable pixels and radius from the beam centre
+    // mean projection, usable pixels and radius from the beam centre. The mean is divided by the
+    // polarization factor, so that what is left varies around a ring only where something is in the
+    // way; `pol` is kept because the counts the Poisson test is made of are the ones that were
+    // recorded, not these. The factor is read off the experiment's own geometry - which follows the
+    // detector's tilt, quarter turns and in-plane rotation - about the centre the rings use.
+    // Following Kahn, Fourme, Gadet, Janin, Dumas & Andre (1982) J. Appl. Cryst. 15, 330-337
+    DiffractionGeometry pol_geometry = geometry;
+    pol_geometry.BeamX_pxl(beam_x).BeamY_pxl(beam_y);
+
     std::vector<float> mean(n_pixels, 0.0f);
+    std::vector<float> pol(n_pixels, 1.0f);
     std::vector<char>  valid(n_pixels, 0);
     std::vector<int>   radius(n_pixels, 0);
     std::atomic<int> max_radius_atomic{0};
@@ -529,11 +549,16 @@ std::vector<uint32_t> ShadowFinder::GetMask(size_t nthreads) const {
         for (int y = ylo; y < yhi; y++)
             for (int x = 0; x < W; x++) {
                 const int i = y * W + x;
+                const float dx = x - beam_x, dy = y - beam_y;
+                if (polarization.has_value())
+                    pol[i] = pol_geometry.CalcAzIntPolarizationCorr(static_cast<float>(x),
+                                                                    static_cast<float>(y),
+                                                                    polarization.value());
                 if (valid_count[i] > 0 && pixel_mask[i] == 0) {
-                    mean[i] = static_cast<float>(static_cast<double>(sum_value[i]) / valid_count[i]);
+                    mean[i] = static_cast<float>(static_cast<double>(sum_value[i])
+                                                 / valid_count[i] / pol[i]);
                     valid[i] = 1;
                 }
-                const float dx = x - beam_x, dy = y - beam_y;
                 radius[i] = static_cast<int>(std::lround(std::sqrt(dx * dx + dy * dy)));
                 local_max = std::max(local_max, radius[i]);
             }
@@ -572,7 +597,9 @@ std::vector<uint32_t> ShadowFinder::GetMask(size_t nthreads) const {
 
 
     // Azimuthal comparison: the median of the ring, iterated so the shadow stays out of the
-    // baseline it is measured against.
+    // baseline it is measured against. Comparing a pixel's background against the background at its
+    // own resolution is how DEFPIX recognises a shaded detector region.
+    // Following Kabsch (2010) Acta Cryst. D66, 125-132
     //
     // The iteration only ever excludes pixels whose pooled background is below a cut, and dividing by
     // a positive baseline is monotone - so the excluded pixels of a ring are exactly the lowest ones,
@@ -619,53 +646,99 @@ std::vector<uint32_t> ShadowFinder::GetMask(size_t nthreads) const {
         if (valid[i])
             ring_pixels[radius[i]]++;
 
-    // A ring lies inside the stop when its background is a fraction of the background further out.
-    // Counting statistics cannot decide this: on a bright dataset the shadow is still well counted.
-    // The comparison is only ever used to answer "is this whole ring inside the stop", never to
-    // judge an individual pixel, so taking the largest background over an outward window is safe
-    // here in a way it would not be per pixel. It is taken only over the rings this same walk is
-    // willing to judge, though: at the corner of the detector a ring holds a handful of pixels and
-    // its median is one pixel's mean, so one recorded reflection out there would otherwise become
-    // the background every ring inside it is compared against.
-    std::vector<float> outward_max(max_radius + 2, 0.0f);
-    for (int rad = max_radius; rad >= 0; rad--)
-        outward_max[rad] = std::max(ring_pixels[rad] >= MIN_RING_PIXELS ? baseline[rad] : 0.0f,
-                                    outward_max[rad + 1]);
+    // A ring lies inside the stop when its background is a fraction of what this detector's
+    // background typically is. Counting statistics cannot decide this: on a bright dataset the
+    // shadow is still well counted. The comparison used to be against the LARGEST background of any
+    // ring further out, and that reads a sample whose background peaks in a strong ring away from
+    // the beam - a powder standard, a strong solvent ring - as a beam stop the size of that ring:
+    // the ordinary background inside it is legitimately below a third of the peak. On one corpus
+    // dataset it declared 16 % of the detector to be stop, with diffraction rings visible inside the
+    // disk it masked. The median over the rings this walk is willing to judge is what "typically"
+    // means, and it is robust from both sides - to a bright ring, and to a corner ring of a handful
+    // of pixels whose median is one pixel's mean.
+    std::vector<float> judgeable;
+    for (int rad = 0; rad <= max_radius; rad++)
+        if (ring_pixels[rad] >= MIN_RING_PIXELS)
+            judgeable.push_back(baseline[rad]);
+    float typical_background = 0.0f;
+    if (!judgeable.empty()) {
+        const auto middle = judgeable.begin() + judgeable.size() / 2;
+        std::nth_element(judgeable.begin(), middle, judgeable.end());
+        typical_background = *middle;
+    }
 
     int blocked_out_to = -1;
     for (int rad = 0; rad <= max_radius; rad++) {
         if (ring_pixels[rad] < MIN_RING_PIXELS)
             continue;
-        if (baseline[rad] >= SHADOW_RATIO * outward_max[rad])
+        if (baseline[rad] >= BLOCKED_RING_RATIO * typical_background)
             break;
         blocked_out_to = rad;
     }
 
+    // The counts a pixel's pooled background is made of, and the counts the ring says it should
+    // have had. The test is on the deficit between them, in units of its own Poisson scatter.
+    std::vector<float> deficit(n_pixels, 0.0f);
     std::vector<char> low(n_pixels, 0);
     ParallelChunks(n_pixels, nthreads, [&](int lo, int hi) {
         for (int i = lo; i < hi; i++) {
             if (!valid[i])
                 continue;
-            if (radius[i] <= blocked_out_to) {
-                low[i] = 1;
-                continue;
-            }
-            const double counted = static_cast<double>(frames) * pooled_count[i];
-            low[i] = ratio[i] < SHADOW_RATIO && baseline[radius[i]] * counted >= MIN_EXPECTED_COUNTS;
+            // The deficit is significant or not in the counts that were recorded, so the pooled
+            // background and what the ring expects of it are both put back on the detector's own
+            // scale before they are compared - the same factor on each, so it is the units of the
+            // comparison that change and not its answer.
+            const double counted = static_cast<double>(frames) * pooled_count[i] * pol[i];
+            deficit[i] = static_cast<float>(poisson_deficit_sigma(pooled[i] * counted,
+                                                                  baseline[radius[i]] * counted));
+            low[i] = ratio[i] < SHADOW_RATIO && deficit[i] > MIN_DEFICIT_SIGMA;
         }
     });
 
 
-    // The shadow is the low region connected to the beam centre, bridging the gaps it crosses.
+    // The shadow is a low region large enough to have been cast by something. Nothing anchors it to
+    // the beam centre: hardware that shadows the detector need not touch the direct beam, and a pin
+    // or a loop typically does not - it begins some way out in radius, with lit detector between it
+    // and the stop. What keeps the test specific instead is size, since the background wanders by a
+    // pixel or two at a time and hardware does not.
     const std::vector<char> bridged = dilate(low, W, H, BRIDGE_PX, nthreads);
-    std::vector<int> seeds;
+    std::vector<char> region(n_pixels, 0);
+    {
+        std::vector<char> seen(n_pixels, 0);
+        std::vector<int> component;
+        std::queue<int> q;
+        for (int start = 0; start < n_pixels; start++) {
+            if (!bridged[start] || seen[start])
+                continue;
+            component.clear();
+            int n_low = 0;
+            seen[start] = 1;
+            q.push(start);
+            while (!q.empty()) {
+                const int i = q.front(); q.pop();
+                component.push_back(i);
+                n_low += low[i];
+                const int y = i / W, x = i % W;
+                for (int dy = -1; dy <= 1; dy++)
+                    for (int dx = -1; dx <= 1; dx++) {
+                        const int yy = y + dy, xx = x + dx;
+                        if (yy < 0 || yy >= H || xx < 0 || xx >= W)
+                            continue;
+                        const int j = yy * W + xx;
+                        if (bridged[j] && !seen[j]) { seen[j] = 1; q.push(j); }
+                    }
+            }
+            if (n_low >= MIN_SHADOW_PIXELS)
+                for (const int i : component)
+                    region[i] = low[i];
+        }
+    }
+
+    // The rings that lie wholly inside the stop are decided by the ring walk above rather than by
+    // the per-pixel test, so they join the region after it and are not asked to be large.
     for (int i = 0; i < n_pixels; i++)
-        if (radius[i] < 4)
-            seeds.push_back(i);
-    const std::vector<char> connected = flood(bridged, W, H, seeds);
-    std::vector<char> region(n_pixels);
-    for (int i = 0; i < n_pixels; i++)
-        region[i] = low[i] && connected[i];
+        if (valid[i] && radius[i] <= blocked_out_to)
+            region[i] = 1;
 
 
     // Recorded reflections. A small cluster is required so a single-frame zinger does not count.
@@ -695,7 +768,7 @@ std::vector<uint32_t> ShadowFinder::GetMask(size_t nthreads) const {
     // Grow the soft boundary, round it and fill the disk interior.
     const std::vector<char> penumbra = dilate(region, W, H, PENUMBRA_MAX_PX, nthreads);
     for (int i = 0; i < n_pixels; i++)
-        if (penumbra[i] && valid[i] && ratio[i] < PENUMBRA_RATIO)
+        if (penumbra[i] && valid[i] && ratio[i] < PENUMBRA_RATIO && deficit[i] > MIN_DEFICIT_SIGMA)
             region[i] = 1;
 
 
diff --git a/image_analysis/beam_stop/ShadowFinder.h b/image_analysis/beam_stop/ShadowFinder.h
index 4bcb99300..5ca1a44bf 100644
--- a/image_analysis/beam_stop/ShadowFinder.h
+++ b/image_analysis/beam_stop/ShadowFinder.h
@@ -7,10 +7,12 @@
 #include <future>
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <vector>
 
 #include "../../common/CompressedImage.h"
 #include "../../common/DiffractionExperiment.h"
+#include "../../common/DiffractionGeometry.h"
 #include "../../common/JFJochMessages.h"
 #include "../../common/PixelMask.h"
 #ifdef JFJOCH_USE_CUDA
@@ -42,8 +44,21 @@ class ShadowFinder {
 
     const int   width;
     const int   height;
-    const float beam_x;
-    const float beam_y;
+    float       beam_x;
+    float       beam_y;
+
+    // What the background owes to the source rather than to the hardware. The scattered background
+    // is not flat around a ring: a polarized source suppresses it in its own plane by a factor that
+    // reaches three at the 2 theta a short detector distance puts in a corner - several times the
+    // dip this class is looking for - so the comparison divides it out before it compares. Of the
+    // corrections a ring carries this is the only one that varies along it; solid angle, detector
+    // and air absorption are all functions of 2 theta alone and the ring's own median absorbs them.
+    // The geometry is kept whole rather than reduced to a distance and a pixel size because the
+    // azimuth is the whole point: detector tilt, a quarter-turned image and an in-plane rotation
+    // all move the polarization plane across the stored image, and the geometry already knows where
+    // it lies. Only the centre is replaced, by the one the caller measured.
+    const DiffractionGeometry geometry;
+    const std::optional<float> polarization;   // unset leaves the background as it was measured
 
     std::vector<uint32_t> pixel_mask;   // pixels already masked carry no background to test
 
@@ -85,6 +100,13 @@ class ShadowFinder {
 public:
     ShadowFinder(const DiffractionExperiment &experiment, const PixelMask &mask);
 
+    // The centre the rings are drawn about. It starts as the file's, which is the only one there
+    // is when the finder is built; a caller that has measured one replaces it before reading the
+    // mask. A centre far from the truth draws the rings across the background's own radial
+    // fall-off instead of along it, and the comparison then describes the fall-off rather than the
+    // hardware. The projection is not centred on anything, so this may be set after the frames.
+    void BeamCenter(float x, float y);
+
     // Give each worker a shard to accumulate into. Must be called before the first AddImage,
     // and costs 20 bytes per pixel per shard.
     void SetShardCount(size_t n);
diff --git a/image_analysis/geom_refinement/BeamCenterFFT.cpp b/image_analysis/geom_refinement/BeamCenterFFT.cpp
new file mode 100644
index 000000000..8ebf71bd9
--- /dev/null
+++ b/image_analysis/geom_refinement/BeamCenterFFT.cpp
@@ -0,0 +1,252 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "BeamCenterFFT.h"
+
+#include <algorithm>
+#include <cmath>
+#include <limits>
+#include <stdexcept>
+
+#include "BeamCenterFFTCPU.h"
+#include "BeamCenterFFTEngine.h"
+#include "../../common/CUDAWrapper.h"
+#ifdef JFJOCH_USE_CUDA
+#include "BeamCenterFFTGPU.h"
+#include "../../common/JFJochException.h"
+#endif
+
+namespace {
+
+// The image prepared for scoring: hot pixels clipped at the 99.9th percentile, the median
+// background level removed, negatives clamped, masked pixels zero. The final subtraction of the
+// valid-pixel mean changes nothing mathematically - the masked Pearson is exactly invariant under
+// a global shift of the image (both D*C - S^2 and D*Q - S^2 cancel the shift) - but it removes
+// most of the large-term cancellation that single-precision FFTs would otherwise have to survive.
+struct Prepared {
+    std::vector<float> a;   // image, 0 on masked pixels
+    std::vector<float> m;   // 1 on valid pixels, 0 on masked
+    double variance = 0.0;  // of a over the valid pixels, after the whole preparation
+};
+
+Prepared PrepareImage(const std::vector<float> &mean) {
+    Prepared out;
+    const size_t n = mean.size();
+    out.a.assign(n, 0.0f);
+    out.m.assign(n, 0.0f);
+
+    std::vector<float> valid;
+    valid.reserve(n);
+    for (float v : mean)
+        if (std::isfinite(v))
+            valid.push_back(v);
+    if (valid.size() < 2)
+        return out;
+
+    auto kth = [&valid](size_t k) {
+        std::nth_element(valid.begin(), valid.begin() + k, valid.end());
+        return valid[k];
+    };
+    const float clip_hi = kth(static_cast<size_t>(0.999 * (valid.size() - 1)));
+    const float median = kth(valid.size() / 2);
+
+    double sum = 0.0;
+    size_t count = 0;
+    for (size_t i = 0; i < n; i++) {
+        if (!std::isfinite(mean[i]))
+            continue;
+        const float v = std::max(0.0f, std::min(std::max(mean[i], 0.0f), clip_hi) - median);
+        out.a[i] = v;
+        out.m[i] = 1.0f;
+        sum += v;
+        count++;
+    }
+    const float shift = static_cast<float>(sum / static_cast<double>(count));
+    double var = 0.0;
+    for (size_t i = 0; i < n; i++)
+        if (out.m[i] != 0.0f) {
+            out.a[i] -= shift;
+            var += static_cast<double>(out.a[i]) * static_cast<double>(out.a[i]);
+        }
+    out.variance = var / static_cast<double>(count);
+    return out;
+}
+
+std::vector<BeamCenterFFTCandidate> Shortlist1D(std::vector<float> &surface, float nms_pxl,
+                                                int budget, bool is_x) {
+    std::vector<BeamCenterFFTCandidate> out;
+    const int64_t n = static_cast<int64_t>(surface.size());
+    const int64_t d = std::lround(2.0f * nms_pxl);
+    for (int k = 0; k < budget; k++) {
+        int64_t best = -1;
+        float best_v = -std::numeric_limits<float>::infinity();
+        for (int64_t i = 0; i < n; i++)
+            if (surface[i] > best_v) {
+                best_v = surface[i];
+                best = i;
+            }
+        if (best < 0 || !std::isfinite(best_v))
+            break;
+        const float c = static_cast<float>(best) / 2.0f;
+        const float nan = std::numeric_limits<float>::quiet_NaN();
+        out.push_back(is_x ? BeamCenterFFTCandidate{c, nan, best_v}
+                           : BeamCenterFFTCandidate{nan, c, best_v});
+        for (int64_t i = std::max<int64_t>(0, best - d); i <= std::min(n - 1, best + d); i++)
+            surface[i] = -std::numeric_limits<float>::infinity();
+    }
+    return out;
+}
+
+float Margin(const std::vector<BeamCenterFFTCandidate> &peaks) {
+    if (peaks.size() < 2 || peaks[0].score <= 0.0f)
+        return 0.0f;
+    return (peaks[0].score - peaks[1].score) / peaks[0].score;
+}
+
+// The same score for a 1D line mirror, whose accumulators were summed over the other coordinate.
+std::vector<float> PearsonLine(const BeamCenterConvSurfaces1D &conv, float min_pair_fraction,
+                               double global_variance) {
+    const size_t n = conv.C.size();
+    double d_max = 0.0;
+    for (double d : conv.D)
+        d_max = std::max(d_max, d);
+    const double lim = min_pair_fraction * d_max;
+    std::vector<float> r(n, -std::numeric_limits<float>::infinity());
+    for (size_t i = 0; i < n; i++) {
+        const double num = conv.D[i] * conv.C[i] - conv.S[i] * conv.S[i];
+        const double den = conv.D[i] * conv.Q[i] - conv.S[i] * conv.S[i];
+        // Same no-evidence floor as the 2D surface: see BEAM_CENTER_VARIANCE_FLOOR.
+        if (conv.D[i] > lim
+            && den > conv.D[i] * conv.D[i] * BEAM_CENTER_VARIANCE_FLOOR * global_variance)
+            r[i] = static_cast<float>(num / den);
+    }
+    return r;
+}
+
+} // namespace
+
+std::vector<float> BeamCenterPointScore(const BeamCenterConvSurfaces2D &conv,
+                                        float min_pair_fraction, double global_variance) {
+    const size_t n = conv.C.size();
+    float d_max = 0.0f;
+    for (size_t i = 0; i < n; i++)
+        d_max = std::max(d_max, conv.D[i]);
+    const double lim = min_pair_fraction * d_max;
+    std::vector<float> r(n, -std::numeric_limits<float>::infinity());
+    for (size_t i = 0; i < n; i++) {
+        const double d = conv.D[i];
+        if (d <= lim)
+            continue;
+        const double s = conv.S[i];
+        const double num = d * conv.C[i] - s * s;
+        const double den = d * conv.Q[i] - s * s;
+        if (den > d * d * BEAM_CENTER_VARIANCE_FLOOR * global_variance)
+            r[i] = static_cast<float>(num / den);
+    }
+    return r;
+}
+
+std::vector<BeamCenterFFTCandidate> BeamCenterShortlist2D(std::vector<float> &surface, int64_t h,
+                                                          int64_t w, float nms_pxl, int budget) {
+    std::vector<BeamCenterFFTCandidate> out;
+    const int64_t d = std::lround(2.0f * nms_pxl);
+    for (int k = 0; k < budget; k++) {
+        int64_t best = -1;
+        float best_v = -std::numeric_limits<float>::infinity();
+        for (int64_t i = 0; i < h * w; i++)
+            if (surface[i] > best_v) {
+                best_v = surface[i];
+                best = i;
+            }
+        if (best < 0 || !std::isfinite(best_v))
+            break;
+        const int64_t iy = best / w, ix = best % w;
+        out.push_back({static_cast<float>(ix) / 2.0f, static_cast<float>(iy) / 2.0f, best_v});
+        for (int64_t y = std::max<int64_t>(0, iy - d); y <= std::min(h - 1, iy + d); y++)
+            for (int64_t x = std::max<int64_t>(0, ix - d); x <= std::min(w - 1, ix + d); x++)
+                surface[static_cast<size_t>(y * w + x)] =
+                        -std::numeric_limits<float>::infinity();
+    }
+    return out;
+}
+
+// The default route, and the whole of the CPU path: the four convolutions come back, and the
+// combination and the search run here.
+std::vector<BeamCenterFFTCandidate>
+BeamCenterFFTEngine::PointShortlist(const std::vector<float> &a, const std::vector<float> &m,
+                                    int64_t h, int64_t w, const BeamCenterFFTSettings &settings,
+                                    double global_variance) {
+    const auto conv = PointSurfaces(a, m, h, w);
+    auto surface = BeamCenterPointScore(conv, settings.min_pair_fraction, global_variance);
+    return BeamCenterShortlist2D(surface, 2 * h, 2 * w, settings.nms_radius_pxl,
+                                 settings.candidates_point);
+}
+
+int64_t BeamCenterFFTPadSize(int64_t n) {
+    for (int64_t k = n;; ++k) {
+        int64_t v = k;
+        for (int p : {2, 3, 5, 7})
+            while (v % p == 0)
+                v /= p;
+        if (v == 1)
+            return k;
+    }
+}
+
+BeamCenterFFTResult BeamCenterFFTScore(int64_t width, int64_t height,
+                                       const std::vector<float> &mean,
+                                       const BeamCenterFFTSettings &settings,
+                                       BeamCenterFFTEngine &engine) {
+    if (width <= 0 || height <= 0
+        || mean.size() != static_cast<size_t>(width) * static_cast<size_t>(height))
+        throw std::runtime_error("BeamCenterFFT: image dimensions do not match the projection");
+
+    BeamCenterFFTResult result;
+    const Prepared prep = PrepareImage(mean);
+
+    result.point = engine.PointShortlist(prep.a, prep.m, height, width, settings, prep.variance);
+
+    {
+        const auto conv_y = engine.LineSurfaces(prep.a, prep.m, height, width,
+                                                BeamCenterMirror::Rows);
+        auto ry = PearsonLine(conv_y, settings.min_pair_fraction, prep.variance);
+        result.line_y = Shortlist1D(ry, settings.nms_radius_pxl, settings.candidates_line, false);
+
+        const auto conv_x = engine.LineSurfaces(prep.a, prep.m, height, width,
+                                                BeamCenterMirror::Columns);
+        auto rx = PearsonLine(conv_x, settings.min_pair_fraction, prep.variance);
+        result.line_x = Shortlist1D(rx, settings.nms_radius_pxl, settings.candidates_line, true);
+    }
+
+    result.margin_point = Margin(result.point);
+    result.margin_line_x = Margin(result.line_x);
+    result.margin_line_y = Margin(result.line_y);
+    return result;
+}
+
+BeamCenterFFTResult BeamCenterFFTScore(int64_t width, int64_t height,
+                                       const std::vector<float> &mean,
+                                       const BeamCenterFFTSettings &settings) {
+#ifdef JFJOCH_USE_CUDA
+    if (get_gpu_count() > 0 && BeamCenterFFTGPU::FitsInDeviceMemory(width, height)) {
+        BeamCenterFFTGPU gpu;
+        try {
+            return BeamCenterFFTScore(width, height, mean, settings, gpu);
+        } catch (const JFJochException &) {
+            // The card is shared with this run's analysis workers, so the memory the check above
+            // saw can be gone by the time it is asked for. A capture is not worth failing a run
+            // over: score it on the CPU instead.
+        }
+    }
+#endif
+    BeamCenterFFTCPU cpu;
+    return BeamCenterFFTScore(width, height, mean, settings, cpu);
+}
+
+BeamCenterFFTResult FindBeamCenterFFT(const DiffractionExperiment &experiment,
+                                      const std::vector<float> &mean,
+                                      const BeamCenterFFTSettings &settings) {
+    // The pre-scan projection is in converted geometry (ShadowFinder's frame).
+    return BeamCenterFFTScore(experiment.GetXPixelsNumConv(), experiment.GetYPixelsNumConv(),
+                              mean, settings);
+}
diff --git a/image_analysis/geom_refinement/BeamCenterFFT.h b/image_analysis/geom_refinement/BeamCenterFFT.h
new file mode 100644
index 000000000..ff7cd188a
--- /dev/null
+++ b/image_analysis/geom_refinement/BeamCenterFFT.h
@@ -0,0 +1,81 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+#include <cstdint>
+#include <vector>
+
+#include "../../common/DiffractionExperiment.h"
+#include "../../common/PixelMask.h"
+
+// Whole-detector beam-centre capture from the symmetry of the scattered image, via FFT.
+//
+// The centrosymmetry score of the image about a candidate centre c, sum_x I(x) I(2c - x), is the
+// self-convolution (I * I)(2c), so one FFT pair scores EVERY candidate centre on the detector at
+// half-pixel spacing in a single transform set - the cost is O(N log N) and independent of how far
+// the true centre is from the value in the file. Three surfaces are computed:
+//
+//  * the 2D point-inversion score - a measurement of the isotropic background (air and solvent
+//    scatter), point-symmetric about the beam whatever the crystal does. It shares its physics
+//    with FindBeamCenterFromBackground, so their agreement is not two votes;
+//  * two 1D line-mirror scores, one per detector axis, mirroring that coordinate only. For the
+//    coordinate along the spindle this is exact Bragg physics: a reflection's Friedel mate
+//    half a turn later lands mirrored in the line through the beam across the spindle
+//    (R_m(180)(-q) = q - 2(q.m)m), so accumulating frames over the sweep makes this score sharp
+//    where the indexing count is blind.
+//
+// The score is a CAPTURE device, not a decision device: measured on 17 datasets its shortlist
+// holds the true centre in the top candidates every time (three gross header errors of 71-351 px
+// captured at rank 1 within 1 px), but the surface can be locally flat, so the result is a
+// shortlist plus a margin - never a single centre. The margin (best minus runner-up, as a
+// fraction of best, after suppression) is the self-diagnostic: measured, ambiguous surfaces sit
+// below ~3 % and clean ones above ~5 %. Callers must verify a candidate (index at it) before
+// believing it, and must not average candidates.
+//
+// The input is the mean-projection the pre-scan already accumulates for the beam-stop search
+// (ShadowFinder::GetMeanProjection), NAN where nothing was counted - so this costs no new I/O.
+//
+// The transforms run on the GPU where there is one with room for them and on fftw3f otherwise
+// (BeamCenterFFTGPU / BeamCenterFFTCPU); everything that decides anything is shared between the
+// two. Whole-detector reach is what this buys, and on a 16 Mpixel detector the transforms are the
+// whole of its cost, so which engine runs them is the difference between seconds and milliseconds.
+
+struct BeamCenterFFTCandidate {
+    float beam_x_pxl = 0.0f;   // NAN in a line_y candidate
+    float beam_y_pxl = 0.0f;   // NAN in a line_x candidate
+    float score = 0.0f;        // masked Pearson r of the image with its mirror about this centre
+};
+
+struct BeamCenterFFTResult {
+    // Non-maximum-suppressed shortlists, strongest first.
+    std::vector<BeamCenterFFTCandidate> point;    // 2D point-inversion score
+    std::vector<BeamCenterFFTCandidate> line_x;   // beam-x from the x line mirror
+    std::vector<BeamCenterFFTCandidate> line_y;   // beam-y from the y line mirror
+
+    // (best - runner_up) / best per surface; 0 when fewer than two peaks survive.
+    float margin_point = 0.0f;
+    float margin_line_x = 0.0f;
+    float margin_line_y = 0.0f;
+};
+
+struct BeamCenterFFTSettings {
+    float nms_radius_pxl = 25.0f;  // peak separation; tracks the score's plateau width
+    int candidates_point = 8;
+    int candidates_line = 4;
+    // Fraction of the maximum mirror-pair count below which a centre is not scored - centres so
+    // far out that almost no pixel has a valid mirror partner correlate noise with noise.
+    float min_pair_fraction = 0.25f;
+};
+
+// Core entry: `mean` is a width x height row-major per-pixel projection, NAN (or any non-finite
+// value) where no valid pixel exists. Kept free of DiffractionExperiment so it can be tested
+// against stored arrays.
+[[nodiscard]] BeamCenterFFTResult
+BeamCenterFFTScore(int64_t width, int64_t height, const std::vector<float> &mean,
+                   const BeamCenterFFTSettings &settings = {});
+
+// Convenience wrapper over the pre-scan projection.
+[[nodiscard]] BeamCenterFFTResult
+FindBeamCenterFFT(const DiffractionExperiment &experiment, const std::vector<float> &mean,
+                  const BeamCenterFFTSettings &settings = {});
diff --git a/image_analysis/geom_refinement/BeamCenterFFTCPU.cpp b/image_analysis/geom_refinement/BeamCenterFFTCPU.cpp
new file mode 100644
index 000000000..6c59f77d6
--- /dev/null
+++ b/image_analysis/geom_refinement/BeamCenterFFTCPU.cpp
@@ -0,0 +1,198 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "BeamCenterFFTCPU.h"
+
+#include <algorithm>
+#include <complex>
+#include <cstring>
+#include <mutex>
+#include <stdexcept>
+
+#include <fftw3.h>
+
+namespace {
+
+// FFTW planning is not thread-safe (execution is); same idiom as FFTIndexerCPU.
+std::mutex &FftwPlanMutex() {
+    static std::mutex m;
+    return m;
+}
+
+// One real-to-complex 2D FFT workspace of fixed padded size, reused for every forward transform.
+class Rfft2 {
+    int64_t ny, nx, nxc;
+    std::vector<float> real;
+    fftwf_plan fwd = nullptr;
+    fftwf_plan bwd = nullptr;
+
+public:
+    std::vector<std::complex<float>> spectrum;
+
+    Rfft2(int64_t ny_, int64_t nx_) : ny(ny_), nx(nx_), nxc(nx_ / 2 + 1) {
+        real.resize(static_cast<size_t>(ny * nx));
+        spectrum.resize(static_cast<size_t>(ny * nxc));
+        std::unique_lock lock(FftwPlanMutex());
+        fwd = fftwf_plan_dft_r2c_2d(static_cast<int>(ny), static_cast<int>(nx), real.data(),
+                                    reinterpret_cast<fftwf_complex *>(spectrum.data()),
+                                    FFTW_ESTIMATE);
+        bwd = fftwf_plan_dft_c2r_2d(static_cast<int>(ny), static_cast<int>(nx),
+                                    reinterpret_cast<fftwf_complex *>(spectrum.data()),
+                                    real.data(), FFTW_ESTIMATE);
+        if (!fwd || !bwd)
+            throw std::runtime_error("BeamCenterFFT: fftwf plan failed");
+    }
+    Rfft2(const Rfft2 &) = delete;
+    Rfft2 &operator=(const Rfft2 &) = delete;
+    ~Rfft2() {
+        std::unique_lock lock(FftwPlanMutex());
+        if (fwd)
+            fftwf_destroy_plan(fwd);
+        if (bwd)
+            fftwf_destroy_plan(bwd);
+    }
+
+    // Zero-pad `src` (height x width) into the workspace and return its spectrum.
+    std::vector<std::complex<float>> Forward(const std::vector<float> &src, int64_t height,
+                                             int64_t width) {
+        std::fill(real.begin(), real.end(), 0.0f);
+        for (int64_t y = 0; y < height; y++)
+            std::memcpy(&real[static_cast<size_t>(y * nx)], &src[static_cast<size_t>(y * width)],
+                        sizeof(float) * static_cast<size_t>(width));
+        fftwf_execute(fwd);
+        return spectrum;   // copy: the workspace is reused
+    }
+
+    // Inverse-transform the elementwise product u*v, normalised, cropped to out_h x out_w.
+    std::vector<float> InverseProduct(const std::vector<std::complex<float>> &u,
+                                      const std::vector<std::complex<float>> &v, int64_t out_h,
+                                      int64_t out_w) {
+        const float norm = 1.0f / (static_cast<float>(ny) * static_cast<float>(nx));
+        for (size_t i = 0; i < spectrum.size(); i++)
+            spectrum[i] = u[i] * v[i];
+        fftwf_execute(bwd);
+        std::vector<float> out(static_cast<size_t>(out_h * out_w));
+        for (int64_t y = 0; y < out_h; y++)
+            for (int64_t x = 0; x < out_w; x++)
+                out[static_cast<size_t>(y * out_w + x)] =
+                        real[static_cast<size_t>(y * nx + x)] * norm;
+        return out;
+    }
+};
+
+std::vector<float> Transpose(const std::vector<float> &src, int64_t h, int64_t w) {
+    std::vector<float> out(src.size());
+    for (int64_t y = 0; y < h; y++)
+        for (int64_t x = 0; x < w; x++)
+            out[static_cast<size_t>(x * h + y)] = src[static_cast<size_t>(y * w + x)];
+    return out;
+}
+
+} // namespace
+
+BeamCenterConvSurfaces2D BeamCenterFFTCPU::PointSurfaces(const std::vector<float> &a,
+                                                         const std::vector<float> &m, int64_t h,
+                                                         int64_t w) {
+    Rfft2 fft(BeamCenterFFTPadSize(2 * h), BeamCenterFFTPadSize(2 * w));
+    const auto A = fft.Forward(a, h, w);
+    const auto M = fft.Forward(m, h, w);
+    std::vector<float> a2(a.size());
+    for (size_t i = 0; i < a2.size(); i++)
+        a2[i] = a[i] * a[i];
+    const auto A2 = fft.Forward(a2, h, w);
+
+    BeamCenterConvSurfaces2D out;
+    out.C = fft.InverseProduct(A, A, 2 * h, 2 * w);
+    out.S = fft.InverseProduct(A, M, 2 * h, 2 * w);
+    out.Q = fft.InverseProduct(A2, M, 2 * h, 2 * w);
+    out.D = fft.InverseProduct(M, M, 2 * h, 2 * w);
+    return out;
+}
+
+// Each sequence is correlated with its own mirror and the four accumulators are summed over the
+// other coordinate in double complex (the same cancellation argument as the 2D surface), so only
+// four inverse transforms are needed however many sequences there are.
+BeamCenterConvSurfaces1D BeamCenterFFTCPU::LineSurfaces(const std::vector<float> &a_in,
+                                                        const std::vector<float> &m_in, int64_t h,
+                                                        int64_t w, BeamCenterMirror mirror) {
+    // Mirroring the column coordinate is the same computation on the transposed image.
+    const std::vector<float> at = mirror == BeamCenterMirror::Rows ? std::vector<float>()
+                                                                   : Transpose(a_in, h, w);
+    const std::vector<float> mt = mirror == BeamCenterMirror::Rows ? std::vector<float>()
+                                                                   : Transpose(m_in, h, w);
+    const std::vector<float> &a = mirror == BeamCenterMirror::Rows ? a_in : at;
+    const std::vector<float> &m = mirror == BeamCenterMirror::Rows ? m_in : mt;
+    const int64_t nseq = mirror == BeamCenterMirror::Rows ? h : w;
+    const int64_t nbatch = mirror == BeamCenterMirror::Rows ? w : h;
+
+    const int64_t nfft = BeamCenterFFTPadSize(2 * nseq);
+    const int64_t nc = nfft / 2 + 1;
+
+    std::vector<float> in(static_cast<size_t>(nfft));
+    std::vector<std::complex<float>> A(static_cast<size_t>(nc)), M(static_cast<size_t>(nc)),
+            A2(static_cast<size_t>(nc));
+    std::vector<std::complex<double>> accC(static_cast<size_t>(nc)), accS(static_cast<size_t>(nc)),
+            accQ(static_cast<size_t>(nc)), accD(static_cast<size_t>(nc));
+
+    fftwf_plan fwd, bwd;
+    {
+        std::unique_lock lock(FftwPlanMutex());
+        fwd = fftwf_plan_dft_r2c_1d(static_cast<int>(nfft), in.data(),
+                                    reinterpret_cast<fftwf_complex *>(A.data()), FFTW_ESTIMATE);
+        bwd = fftwf_plan_dft_c2r_1d(static_cast<int>(nfft),
+                                    reinterpret_cast<fftwf_complex *>(A.data()), in.data(),
+                                    FFTW_ESTIMATE);
+    }
+    if (!fwd || !bwd)
+        throw std::runtime_error("BeamCenterFFT: fftwf 1D plan failed");
+
+    auto forward_into = [&](auto value_of, std::vector<std::complex<float>> &dst) {
+        for (int64_t y = 0; y < nseq; y++)
+            in[static_cast<size_t>(y)] = value_of(y);
+        std::fill(in.begin() + nseq, in.end(), 0.0f);
+        fftwf_execute_dft_r2c(fwd, in.data(), reinterpret_cast<fftwf_complex *>(A.data()));
+        dst = A;
+    };
+
+    for (int64_t x = 0; x < nbatch; x++) {
+        forward_into([&](int64_t y) { return a[static_cast<size_t>(y * nbatch + x)]; }, A2);
+        std::swap(A, A2);   // A = spectrum of the sequence of a
+        std::vector<std::complex<float>> Acol = A;
+        forward_into([&](int64_t y) { return m[static_cast<size_t>(y * nbatch + x)]; }, M);
+        forward_into(
+                [&](int64_t y) {
+                    const float v = a[static_cast<size_t>(y * nbatch + x)];
+                    return v * v;
+                },
+                A2);
+        for (int64_t i = 0; i < nc; i++) {
+            const std::complex<double> ca(Acol[i]), cm(M[i]), ca2(A2[i]);
+            accC[i] += ca * ca;
+            accS[i] += ca * cm;
+            accQ[i] += ca2 * cm;
+            accD[i] += cm * cm;
+        }
+    }
+
+    const double norm = 1.0 / static_cast<double>(nfft);
+    auto inverse = [&](const std::vector<std::complex<double>> &acc) {
+        for (int64_t i = 0; i < nc; i++)
+            A[i] = std::complex<float>(acc[i]);
+        fftwf_execute_dft_c2r(bwd, reinterpret_cast<fftwf_complex *>(A.data()), in.data());
+        std::vector<double> out(static_cast<size_t>(2 * nseq));
+        for (int64_t i = 0; i < 2 * nseq; i++)
+            out[static_cast<size_t>(i)] = in[static_cast<size_t>(i)] * norm;
+        return out;
+    };
+    BeamCenterConvSurfaces1D out;
+    out.C = inverse(accC);
+    out.S = inverse(accS);
+    out.Q = inverse(accQ);
+    out.D = inverse(accD);
+    {
+        std::unique_lock lock(FftwPlanMutex());
+        fftwf_destroy_plan(fwd);
+        fftwf_destroy_plan(bwd);
+    }
+    return out;
+}
diff --git a/image_analysis/geom_refinement/BeamCenterFFTCPU.h b/image_analysis/geom_refinement/BeamCenterFFTCPU.h
new file mode 100644
index 000000000..0385ba084
--- /dev/null
+++ b/image_analysis/geom_refinement/BeamCenterFFTCPU.h
@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+#include "BeamCenterFFTEngine.h"
+
+// The beam-centre transforms on fftw3f. Always built (FFTW is fetched unconditionally), and the
+// fallback wherever there is no GPU to run them on.
+class BeamCenterFFTCPU : public BeamCenterFFTEngine {
+public:
+    BeamCenterConvSurfaces2D PointSurfaces(const std::vector<float> &a, const std::vector<float> &m,
+                                           int64_t h, int64_t w) override;
+    BeamCenterConvSurfaces1D LineSurfaces(const std::vector<float> &a, const std::vector<float> &m,
+                                          int64_t h, int64_t w, BeamCenterMirror mirror) override;
+};
diff --git a/image_analysis/geom_refinement/BeamCenterFFTEngine.h b/image_analysis/geom_refinement/BeamCenterFFTEngine.h
new file mode 100644
index 000000000..8175670f7
--- /dev/null
+++ b/image_analysis/geom_refinement/BeamCenterFFTEngine.h
@@ -0,0 +1,95 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+#include <cstdint>
+#include <vector>
+
+#include "BeamCenterFFT.h"
+
+// The transform half of BeamCenterFFTScore, with a CPU (fftw3f) and a GPU (cuFFT) implementation
+// chosen the way the FFT indexer's are. Everything that decides anything - the preparation of the
+// image, the masked Pearson combination, the shortlist and the margins - is shared, so the two
+// engines can differ only in how the four convolutions are computed. That is what makes them
+// comparable: the parity test scores one image with each and compares the shortlists.
+//
+// The masked Pearson needs four convolutions of the prepared image `a` and its valid-pixel mask
+// `m`: C = a (*) a, S = a (*) m, Q = a^2 (*) m and D = m (*) m.
+
+// The 2D point-inversion score: each surface cropped to 2h x 2w, row-major.
+struct BeamCenterConvSurfaces2D {
+    std::vector<float> C, S, Q, D;
+};
+
+// The 1D line-mirror score: each sequence correlated with its own mirror and the four accumulators
+// summed over the other coordinate, so each surface is 2 x (the mirrored extent) long.
+struct BeamCenterConvSurfaces1D {
+    std::vector<double> C, S, Q, D;
+};
+
+// Which coordinate the 1D score mirrors: Rows mirrors y (each column is one sequence) and gives
+// the beam's y; Columns mirrors x and gives its x.
+enum class BeamCenterMirror { Rows, Columns };
+
+class BeamCenterFFTEngine {
+public:
+    virtual ~BeamCenterFFTEngine() = default;
+
+    // `a` and `m` are h x w row-major, as PrepareImage leaves them.
+    virtual BeamCenterConvSurfaces2D PointSurfaces(const std::vector<float> &a,
+                                                   const std::vector<float> &m, int64_t h,
+                                                   int64_t w) = 0;
+    virtual BeamCenterConvSurfaces1D LineSurfaces(const std::vector<float> &a,
+                                                  const std::vector<float> &m, int64_t h, int64_t w,
+                                                  BeamCenterMirror mirror) = 0;
+
+    // The 2D point score all the way to its shortlist. The default - and the whole of the CPU
+    // path - is PointSurfaces followed by BeamCenterPointScore and BeamCenterShortlist2D below.
+    // An engine whose surfaces are already somewhere else overrides it rather than moving them:
+    // on a 16 Mpixel detector the two host steps are 1.8 s and bringing the four surfaces back is
+    // another 0.9 s, against 26 ms of transform.
+    virtual std::vector<BeamCenterFFTCandidate>
+    PointShortlist(const std::vector<float> &a, const std::vector<float> &m, int64_t h, int64_t w,
+                   const BeamCenterFFTSettings &settings, double global_variance);
+};
+
+// The masked Pearson r(t) = (D*C - S^2) / (D*Q - S^2) from the four convolution surfaces, combined
+// elementwise in double: the numerator and denominator are cancellations of large near-equal terms,
+// and the shortlist margins ride on differences of ~0.3 %. Centres whose mirror overlap holds fewer
+// than `min_pair_fraction` of the largest pair count, and those whose overlap carries no variance
+// (see BEAM_CENTER_VARIANCE_FLOOR), score -infinity.
+//
+// This is the reference implementation. An engine that computes the same thing where its surfaces
+// already are is held to it element by element by the parity test.
+[[nodiscard]] std::vector<float> BeamCenterPointScore(const BeamCenterConvSurfaces2D &conv,
+                                                      float min_pair_fraction,
+                                                      double global_variance);
+
+// Greedy shortlist of a 2D score surface: strongest peak first, a square of half-width `nms_pxl`
+// around each taken peak suppressed. Ties go to the lowest index, and a non-finite entry is never a
+// peak. The surface is indexed by t = 2c, so the centre grid is half-pixel. Reference, as above.
+// `surface` is consumed - the suppression is written into it.
+[[nodiscard]] std::vector<BeamCenterFFTCandidate> BeamCenterShortlist2D(std::vector<float> &surface,
+                                                                        int64_t h, int64_t w,
+                                                                        float nms_pxl, int budget);
+
+// The denominator D*Q - S^2 equals D^2 times the image variance over the mirror overlap, so an
+// overlap with (nearly) no variance - a mirrored empty corner, everything clamped to zero by the
+// preparation - carries no evidence and its r is pure roundoff (measured: such a region minted
+// r = 4..274 on a synthetic image, in float64 as much as float32). This is the fraction of the
+// whole image's variance an overlap must reach to be scored at all; on real detector images every
+// overlap that passes the pair-count gate is orders of magnitude above it.
+constexpr double BEAM_CENTER_VARIANCE_FLOOR = 1e-4;
+
+// Smallest 2-3-5-7-smooth transform length >= n. Both engines pad to it, so both score the same
+// grid. A smooth length is not a micro-optimisation here: the naive next-power-of-two pad of a
+// 16 Mpixel detector costs 3x the time of the smooth one on both FFTW and cuFFT, and 2.5 GB of
+// cuFFT plan memory against a few hundred MB (measured).
+[[nodiscard]] int64_t BeamCenterFFTPadSize(int64_t n);
+
+// BeamCenterFFTScore with the engine named rather than chosen, for the GPU/CPU parity test.
+[[nodiscard]] BeamCenterFFTResult BeamCenterFFTScore(int64_t width, int64_t height,
+                                                     const std::vector<float> &mean,
+                                                     const BeamCenterFFTSettings &settings,
+                                                     BeamCenterFFTEngine &engine);
diff --git a/image_analysis/geom_refinement/BeamCenterFFTGPU.cu b/image_analysis/geom_refinement/BeamCenterFFTGPU.cu
new file mode 100644
index 000000000..93e0b77d1
--- /dev/null
+++ b/image_analysis/geom_refinement/BeamCenterFFTGPU.cu
@@ -0,0 +1,517 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "BeamCenterFFTGPU.h"
+
+#include <algorithm>
+#include <cmath>
+#include <limits>
+
+#include <cuda_runtime.h>
+#include <cufft.h>
+
+#include "../indexing/CUDAMemHelpers.h"
+
+namespace {
+
+constexpr int BLOCK = 256;
+// Threads per frequency in the 1D accumulation. A power of two, for the shared-memory reduction.
+constexpr int ACCUMULATE_THREADS = 128;
+// Blocks in the greedy search's reduction. Each returns one candidate, and the last step of the
+// reduction is done on the host over that many - a thousand is far below what a download costs and
+// far above what the card needs to stay busy.
+constexpr int SHORTLIST_BLOCKS = 1024;
+
+int Blocks(int64_t n) { return static_cast<int>((n + BLOCK - 1) / BLOCK); }
+
+void Check(cudaError_t err, const char *what) {
+    if (err != cudaSuccess)
+        throw JFJochException(JFJochExceptionCategory::GPUCUDAError, what);
+}
+
+void Check(cufftResult res, const char *what) {
+    if (res != CUFFT_SUCCESS)
+        throw JFJochException(JFJochExceptionCategory::GPUCUDAError, what);
+}
+
+std::vector<int> Dims(int64_t a) { return {static_cast<int>(a)}; }
+std::vector<int> Dims(int64_t a, int64_t b) { return {static_cast<int>(a), static_cast<int>(b)}; }
+
+__global__ void SquareInPlace(float *data, int64_t n) {
+    const int64_t i = blockIdx.x * static_cast<int64_t>(blockDim.x) + threadIdx.x;
+    if (i < n)
+        data[i] *= data[i];
+}
+
+__global__ void MultiplySpectra(const cufftComplex *u, const cufftComplex *v, cufftComplex *out,
+                                int64_t n) {
+    const int64_t i = blockIdx.x * static_cast<int64_t>(blockDim.x) + threadIdx.x;
+    if (i < n)
+        out[i] = cuCmulf(u[i], v[i]);
+}
+
+// The inverse transform leaves an unnormalised ny x nx result; only its 2h x 2w corner is the
+// convolution surface. Scale that corner in place, for the one surface that stays where it is...
+__global__ void ScaleCorner(float *data, int64_t nx, int64_t out_h, int64_t out_w, float norm) {
+    const int64_t i = blockIdx.x * static_cast<int64_t>(blockDim.x) + threadIdx.x;
+    if (i >= out_h * out_w)
+        return;
+    const int64_t y = i / out_w;
+    data[y * nx + (i - y * out_w)] *= norm;
+}
+
+// ...and scale it into a surface of its own for the three that have to outlive the next inverse.
+__global__ void CopyScaledCorner(const float *src, int64_t nx, int64_t out_h, int64_t out_w,
+                                 float norm, float *dst) {
+    const int64_t i = blockIdx.x * static_cast<int64_t>(blockDim.x) + threadIdx.x;
+    if (i >= out_h * out_w)
+        return;
+    const int64_t y = i / out_w;
+    dst[i] = src[y * nx + (i - y * out_w)] * norm;
+}
+
+// Lay each sequence out contiguously, zero-padded to nfft, so the 1D transforms are a plain batch:
+// out[b * nfft + s] = img[b * stride_batch + s * stride_seq], squared where asked.
+__global__ void GatherSequences(const float *img, int64_t nseq, int64_t nbatch, int64_t stride_seq,
+                                int64_t stride_batch, int64_t nfft, int square, float *out) {
+    const int64_t i = blockIdx.x * static_cast<int64_t>(blockDim.x) + threadIdx.x;
+    if (i >= nbatch * nfft)
+        return;
+    const int64_t b = i / nfft;
+    const int64_t s = i - b * nfft;
+    float v = 0.0f;
+    if (s < nseq) {
+        v = img[b * stride_batch + s * stride_seq];
+        if (square)
+            v *= v;
+    }
+    out[i] = v;
+}
+
+// The four accumulators of the 1D score, summed over the batch in double - the same widening the
+// host path does, and for the same reason: the numerator and denominator below are cancellations
+// of large near-equal terms. One block per frequency.
+__global__ void AccumulateSpectra(const cufftComplex *A, const cufftComplex *M,
+                                  const cufftComplex *A2, int64_t nbatch, int64_t nc, double2 *accC,
+                                  double2 *accS, double2 *accQ, double2 *accD) {
+    __shared__ double2 red[4][ACCUMULATE_THREADS];
+    const int64_t i = blockIdx.x;
+    double2 c = {0.0, 0.0}, s = {0.0, 0.0}, q = {0.0, 0.0}, d = {0.0, 0.0};
+    for (int64_t b = threadIdx.x; b < nbatch; b += blockDim.x) {
+        const cufftComplex fa = A[b * nc + i], fm = M[b * nc + i], fa2 = A2[b * nc + i];
+        const double ar = fa.x, ai = fa.y, mr = fm.x, mi = fm.y, qr = fa2.x, qi = fa2.y;
+        c.x += ar * ar - ai * ai;
+        c.y += ar * ai + ai * ar;
+        s.x += ar * mr - ai * mi;
+        s.y += ar * mi + ai * mr;
+        q.x += qr * mr - qi * mi;
+        q.y += qr * mi + qi * mr;
+        d.x += mr * mr - mi * mi;
+        d.y += mr * mi + mi * mr;
+    }
+    red[0][threadIdx.x] = c;
+    red[1][threadIdx.x] = s;
+    red[2][threadIdx.x] = q;
+    red[3][threadIdx.x] = d;
+    for (unsigned stride = blockDim.x / 2; stride > 0; stride /= 2) {
+        __syncthreads();
+        if (threadIdx.x < stride)
+            for (int k = 0; k < 4; k++) {
+                red[k][threadIdx.x].x += red[k][threadIdx.x + stride].x;
+                red[k][threadIdx.x].y += red[k][threadIdx.x + stride].y;
+            }
+    }
+    if (threadIdx.x == 0) {
+        accC[i] = red[0][0];
+        accS[i] = red[1][0];
+        accQ[i] = red[2][0];
+        accD[i] = red[3][0];
+    }
+}
+
+// The four accumulators narrowed back to single precision and packed as one batch of four, ready
+// for the inverse transform - exactly what the host path does before its four inverses.
+__global__ void PackAccumulators(const double2 *accC, const double2 *accS, const double2 *accQ,
+                                 const double2 *accD, int64_t nc, cufftComplex *out) {
+    const int64_t i = blockIdx.x * static_cast<int64_t>(blockDim.x) + threadIdx.x;
+    if (i >= nc)
+        return;
+    const double2 *acc[4] = {accC, accS, accQ, accD};
+    for (int k = 0; k < 4; k++)
+        out[k * nc + i] = make_cuFloatComplex(static_cast<float>(acc[k][i].x),
+                                              static_cast<float>(acc[k][i].y));
+}
+
+// The masked Pearson, elementwise in double, exactly as BeamCenterPointScore does it on the host -
+// the numerator and the denominator are cancellations of large near-equal terms. Q is read out of
+// the transform buffer where the last inverse left it, so it needs no surface of its own. The score
+// replaces C, which nothing wants afterwards.
+__global__ void PearsonKernel(float *C, const float *S, const float *D, const float *Q_padded,
+                              int64_t nx, int64_t out_h, int64_t out_w, double lim,
+                              double variance_limit) {
+    const int64_t i = blockIdx.x * static_cast<int64_t>(blockDim.x) + threadIdx.x;
+    if (i >= out_h * out_w)
+        return;
+    const double d = D[i];
+    if (d <= lim) {
+        C[i] = -INFINITY;
+        return;
+    }
+    const int64_t y = i / out_w;
+    const double q = Q_padded[y * nx + (i - y * out_w)];
+    const double s = S[i];
+    const double num = d * C[i] - s * s;
+    const double den = d * q - s * s;
+    C[i] = den > d * d * variance_limit ? static_cast<float>(num / den) : -INFINITY;
+}
+
+// The host's rule for the greedy search, so the device finds the same peak: a strictly greater
+// value wins, among equal values the lower index does, and an index of -1 means "nothing found"
+// (which is what a surface of -infinity leaves, and what ends the shortlist).
+__device__ bool TakeRight(float lv, int64_t li, float rv, int64_t ri) {
+    if (ri < 0)
+        return false;
+    if (li < 0)
+        return true;
+    return rv > lv || (rv == lv && ri < li);
+}
+
+__global__ void BlockBest(const float *r, int64_t n, float *block_value, int64_t *block_index) {
+    __shared__ float sv[BLOCK];
+    __shared__ int64_t si[BLOCK];
+    float bv = -INFINITY;
+    int64_t bi = -1;
+    for (int64_t i = blockIdx.x * static_cast<int64_t>(blockDim.x) + threadIdx.x; i < n;
+         i += static_cast<int64_t>(gridDim.x) * blockDim.x)
+        if (r[i] > bv) {   // increasing i, so the lowest index among equal values is the one kept
+            bv = r[i];
+            bi = i;
+        }
+    sv[threadIdx.x] = bv;
+    si[threadIdx.x] = bi;
+    for (unsigned stride = blockDim.x / 2; stride > 0; stride /= 2) {
+        __syncthreads();
+        if (threadIdx.x < stride
+            && TakeRight(sv[threadIdx.x], si[threadIdx.x], sv[threadIdx.x + stride],
+                         si[threadIdx.x + stride])) {
+            sv[threadIdx.x] = sv[threadIdx.x + stride];
+            si[threadIdx.x] = si[threadIdx.x + stride];
+        }
+    }
+    if (threadIdx.x == 0) {
+        block_value[blockIdx.x] = sv[0];
+        block_index[blockIdx.x] = si[0];
+    }
+}
+
+// The non-maximum suppression square around a peak that has been taken.
+__global__ void Suppress(float *r, int64_t w, int64_t x0, int64_t x1, int64_t y0, int64_t y1) {
+    const int64_t cols = x1 - x0 + 1;
+    const int64_t i = blockIdx.x * static_cast<int64_t>(blockDim.x) + threadIdx.x;
+    if (i >= (y1 - y0 + 1) * cols)
+        return;
+    const int64_t y = i / cols;
+    r[(y0 + y) * w + x0 + (i - y * cols)] = -INFINITY;
+}
+
+void CheckLastKernel(const char *what) {
+    Check(cudaGetLastError(), what);
+}
+
+// The 2D transform set, left on the device. Only THREE 2h x 2w surfaces are ever allocated: the
+// fourth is the last inverse's output, and nothing overwrites the transform buffer afterwards, so
+// Q is read where it lies.
+struct PointSurfacesDevice {
+    CudaDevicePtr<float> C, S, D;   // 2h x 2w, normalised
+    CudaDevicePtr<float> real;      // ny x nx; its 2h x 2w corner is Q, normalised
+    int64_t nx = 0;
+};
+
+PointSurfacesDevice TransformPoint(const std::vector<float> &a, const std::vector<float> &m,
+                                   int64_t h, int64_t w) {
+    const int64_t ny = BeamCenterFFTPadSize(2 * h);
+    const int64_t nx = BeamCenterFFTPadSize(2 * w);
+    const int64_t nxc = nx / 2 + 1;
+    const int64_t nreal = ny * nx;
+    const int64_t ncomplex = ny * nxc;
+    const int64_t ncrop = 4 * h * w;
+
+    PointSurfacesDevice out;
+    out.nx = nx;
+    out.real = CudaDevicePtr<float>(nreal);
+    CudaDevicePtr<cufftComplex> d_a(ncomplex), d_m(ncomplex), d_prod(ncomplex);
+
+    CudaFFTPlan fwd(2, Dims(ny, nx), Dims(ny, nx), 1, static_cast<int>(nreal), Dims(ny, nxc), 1,
+                    static_cast<int>(ncomplex), CUFFT_R2C, 1);
+    CudaFFTPlan inv(2, Dims(ny, nx), Dims(ny, nxc), 1, static_cast<int>(ncomplex), Dims(ny, nx), 1,
+                    static_cast<int>(nreal), CUFFT_C2R, 1);
+
+    auto upload = [&](const std::vector<float> &src) {
+        Check(cudaMemset(out.real.get(), 0, nreal * sizeof(float)),
+              "BeamCenterFFT: memset failed");
+        Check(cudaMemcpy2D(out.real.get(), nx * sizeof(float), src.data(), w * sizeof(float),
+                           w * sizeof(float), h, cudaMemcpyHostToDevice),
+              "BeamCenterFFT: image upload failed");
+    };
+
+    upload(a);
+    Check(cufftExecR2C(fwd, out.real, d_a), "BeamCenterFFT: forward transform failed");
+    upload(m);
+    Check(cufftExecR2C(fwd, out.real, d_m), "BeamCenterFFT: forward transform failed");
+
+    const float norm = 1.0f / (static_cast<float>(ny) * static_cast<float>(nx));
+    // The inverse leaves an unnormalised ny x nx result whose 2h x 2w corner is the surface.
+    auto inverse_product = [&](const cufftComplex *u, const cufftComplex *v) {
+        MultiplySpectra<<<Blocks(ncomplex), BLOCK>>>(u, v, d_prod.get(), ncomplex);
+        CheckLastKernel("BeamCenterFFT: spectrum product failed");
+        Check(cufftExecC2R(inv, d_prod, out.real), "BeamCenterFFT: inverse transform failed");
+    };
+    auto take_corner = [&](CudaDevicePtr<float> &dst) {
+        dst = CudaDevicePtr<float>(ncrop);
+        CopyScaledCorner<<<Blocks(ncrop), BLOCK>>>(out.real.get(), nx, 2 * h, 2 * w, norm,
+                                                   dst.get());
+        CheckLastKernel("BeamCenterFFT: surface scaling failed");
+    };
+
+    inverse_product(d_a, d_a);
+    take_corner(out.C);
+    inverse_product(d_a, d_m);
+    take_corner(out.S);
+    inverse_product(d_m, d_m);
+    take_corner(out.D);
+    // The spectrum of a is finished with, so a^2 goes in its place rather than in a fourth buffer.
+    upload(a);
+    SquareInPlace<<<Blocks(nreal), BLOCK>>>(out.real.get(), nreal);
+    CheckLastKernel("BeamCenterFFT: squaring failed");
+    Check(cufftExecR2C(fwd, out.real, d_a), "BeamCenterFFT: forward transform failed");
+    inverse_product(d_a, d_m);
+    ScaleCorner<<<Blocks(ncrop), BLOCK>>>(out.real.get(), nx, 2 * h, 2 * w, norm);
+    CheckLastKernel("BeamCenterFFT: surface scaling failed");
+    return out;
+}
+
+// The masked Pearson over the four surfaces, leaving the score in `surf.C`.
+void ScorePoint(PointSurfacesDevice &surf, int64_t h, int64_t w, float min_pair_fraction,
+                double global_variance) {
+    const int64_t ncrop = 4 * h * w;
+    CudaDevicePtr<float> block_value(SHORTLIST_BLOCKS);
+    CudaDevicePtr<int64_t> block_index(SHORTLIST_BLOCKS);
+    BlockBest<<<SHORTLIST_BLOCKS, BLOCK>>>(surf.D.get(), ncrop, block_value.get(),
+                                           block_index.get());
+    CheckLastKernel("BeamCenterFFT: pair-count maximum failed");
+    std::vector<float> values(SHORTLIST_BLOCKS);
+    Check(cudaMemcpy(values.data(), block_value.get(), values.size() * sizeof(float),
+                     cudaMemcpyDeviceToHost),
+          "BeamCenterFFT: pair-count maximum download failed");
+    float d_max = 0.0f;   // as on the host, where the running maximum starts at zero
+    for (float v : values)
+        d_max = std::max(d_max, v);
+
+    PearsonKernel<<<Blocks(ncrop), BLOCK>>>(surf.C.get(), surf.S.get(), surf.D.get(),
+                                            surf.real.get(), surf.nx, 2 * h, 2 * w,
+                                            min_pair_fraction * static_cast<double>(d_max),
+                                            BEAM_CENTER_VARIANCE_FLOOR * global_variance);
+    CheckLastKernel("BeamCenterFFT: masked Pearson failed");
+}
+
+} // namespace
+
+BeamCenterConvSurfaces2D BeamCenterFFTGPU::PointSurfaces(const std::vector<float> &a,
+                                                         const std::vector<float> &m, int64_t h,
+                                                         int64_t w) {
+    // The four surfaces brought back as the interface describes them. Nothing in the pipeline asks
+    // for this any more - PointShortlist below keeps them on the device - but the shared host code
+    // is written on them and the parity test compares them, so the engine still supplies them.
+    PointSurfacesDevice surf = TransformPoint(a, m, h, w);
+    const size_t ncrop = static_cast<size_t>(4 * h * w);
+
+    BeamCenterConvSurfaces2D out;
+    auto download = [&](const CudaDevicePtr<float> &src, std::vector<float> &dst) {
+        dst.resize(ncrop);
+        Check(cudaMemcpy(dst.data(), src.get(), ncrop * sizeof(float), cudaMemcpyDeviceToHost),
+              "BeamCenterFFT: surface download failed");
+    };
+    download(surf.C, out.C);
+    download(surf.S, out.S);
+    download(surf.D, out.D);
+    out.Q.resize(ncrop);
+    Check(cudaMemcpy2D(out.Q.data(), 2 * w * sizeof(float), surf.real.get(),
+                       surf.nx * sizeof(float), 2 * w * sizeof(float), 2 * h,
+                       cudaMemcpyDeviceToHost),
+          "BeamCenterFFT: surface download failed");
+    return out;
+}
+
+std::vector<float> BeamCenterFFTGPU::PointScoreSurface(const std::vector<float> &a,
+                                                       const std::vector<float> &m, int64_t h,
+                                                       int64_t w, float min_pair_fraction,
+                                                       double global_variance) {
+    PointSurfacesDevice surf = TransformPoint(a, m, h, w);
+    ScorePoint(surf, h, w, min_pair_fraction, global_variance);
+    std::vector<float> out(static_cast<size_t>(4 * h * w));
+    Check(cudaMemcpy(out.data(), surf.C.get(), out.size() * sizeof(float), cudaMemcpyDeviceToHost),
+          "BeamCenterFFT: score download failed");
+    return out;
+}
+
+std::vector<BeamCenterFFTCandidate>
+BeamCenterFFTGPU::PointShortlist(const std::vector<float> &a, const std::vector<float> &m,
+                                 int64_t h, int64_t w, const BeamCenterFFTSettings &settings,
+                                 double global_variance) {
+    PointSurfacesDevice surf = TransformPoint(a, m, h, w);
+    ScorePoint(surf, h, w, settings.min_pair_fraction, global_variance);
+
+    // The greedy search, peak by peak, where the surface is. Each round reduces it to one candidate
+    // per block and the host picks between those by the same rule, so the answer is the host's and
+    // does not depend on how the reduction was split.
+    const int64_t surface_h = 2 * h, surface_w = 2 * w;
+    const int64_t n = surface_h * surface_w;
+    const int64_t d = std::lround(2.0f * settings.nms_radius_pxl);
+    CudaDevicePtr<float> block_value(SHORTLIST_BLOCKS);
+    CudaDevicePtr<int64_t> block_index(SHORTLIST_BLOCKS);
+    std::vector<float> values(SHORTLIST_BLOCKS);
+    std::vector<int64_t> indices(SHORTLIST_BLOCKS);
+
+    std::vector<BeamCenterFFTCandidate> out;
+    for (int k = 0; k < settings.candidates_point; k++) {
+        BlockBest<<<SHORTLIST_BLOCKS, BLOCK>>>(surf.C.get(), n, block_value.get(),
+                                               block_index.get());
+        CheckLastKernel("BeamCenterFFT: peak search failed");
+        Check(cudaMemcpy(values.data(), block_value.get(), values.size() * sizeof(float),
+                         cudaMemcpyDeviceToHost),
+              "BeamCenterFFT: peak download failed");
+        Check(cudaMemcpy(indices.data(), block_index.get(), indices.size() * sizeof(int64_t),
+                         cudaMemcpyDeviceToHost),
+              "BeamCenterFFT: peak download failed");
+
+        int64_t best = -1;
+        float best_v = -std::numeric_limits<float>::infinity();
+        for (int b = 0; b < SHORTLIST_BLOCKS; b++)
+            if (indices[b] >= 0
+                && (values[b] > best_v || (values[b] == best_v && indices[b] < best)))
+                best_v = values[b], best = indices[b];
+        if (best < 0 || !std::isfinite(best_v))
+            break;
+
+        const int64_t iy = best / surface_w, ix = best % surface_w;
+        out.push_back({static_cast<float>(ix) / 2.0f, static_cast<float>(iy) / 2.0f, best_v});
+        const int64_t y0 = std::max<int64_t>(0, iy - d), y1 = std::min(surface_h - 1, iy + d);
+        const int64_t x0 = std::max<int64_t>(0, ix - d), x1 = std::min(surface_w - 1, ix + d);
+        Suppress<<<Blocks((y1 - y0 + 1) * (x1 - x0 + 1)), BLOCK>>>(surf.C.get(), surface_w, x0, x1,
+                                                                   y0, y1);
+        CheckLastKernel("BeamCenterFFT: peak suppression failed");
+    }
+    return out;
+}
+
+BeamCenterConvSurfaces1D BeamCenterFFTGPU::LineSurfaces(const std::vector<float> &a,
+                                                        const std::vector<float> &m, int64_t h,
+                                                        int64_t w, BeamCenterMirror mirror) {
+    const bool rows = mirror == BeamCenterMirror::Rows;
+    const int64_t nseq = rows ? h : w;
+    const int64_t nbatch = rows ? w : h;
+    const int64_t stride_seq = rows ? w : 1;     // step between two samples of one sequence
+    const int64_t stride_batch = rows ? 1 : w;   // step between two sequences
+    const int64_t nfft = BeamCenterFFTPadSize(2 * nseq);
+    const int64_t nc = nfft / 2 + 1;
+
+    BeamCenterConvSurfaces1D out;
+    CudaDevicePtr<double2> accC(nc), accS(nc), accQ(nc), accD(nc);
+    {
+        CudaDevicePtr<float> d_img(h * w), d_in(nfft * nbatch);
+        CudaDevicePtr<cufftComplex> d_a(nbatch * nc), d_m(nbatch * nc), d_a2(nbatch * nc);
+        CudaFFTPlan fwd(1, Dims(nfft), Dims(nfft), 1, static_cast<int>(nfft), Dims(nc), 1,
+                        static_cast<int>(nc), CUFFT_R2C, static_cast<int>(nbatch));
+
+        auto transform = [&](int square, cufftComplex *dst) {
+            GatherSequences<<<Blocks(nfft * nbatch), BLOCK>>>(d_img.get(), nseq, nbatch, stride_seq,
+                                                              stride_batch, nfft, square,
+                                                              d_in.get());
+            CheckLastKernel("BeamCenterFFT: sequence gather failed");
+            Check(cufftExecR2C(fwd, d_in, dst), "BeamCenterFFT: forward transform failed");
+        };
+        auto upload = [&](const std::vector<float> &src) {
+            Check(cudaMemcpy(d_img.get(), src.data(), h * w * sizeof(float),
+                             cudaMemcpyHostToDevice),
+                  "BeamCenterFFT: image upload failed");
+        };
+
+        upload(a);
+        transform(0, d_a);
+        transform(1, d_a2);
+        upload(m);
+        transform(0, d_m);
+
+        AccumulateSpectra<<<static_cast<int>(nc), ACCUMULATE_THREADS>>>(d_a, d_m, d_a2, nbatch, nc,
+                                                                        accC, accS, accQ, accD);
+        CheckLastKernel("BeamCenterFFT: spectrum accumulation failed");
+    }
+
+    CudaDevicePtr<cufftComplex> d_pack(4 * nc);
+    CudaDevicePtr<float> d_out(4 * nfft);
+    PackAccumulators<<<Blocks(nc), BLOCK>>>(accC, accS, accQ, accD, nc, d_pack.get());
+    CheckLastKernel("BeamCenterFFT: accumulator packing failed");
+    CudaFFTPlan inv(1, Dims(nfft), Dims(nc), 1, static_cast<int>(nc), Dims(nfft), 1,
+                    static_cast<int>(nfft), CUFFT_C2R, 4);
+    Check(cufftExecC2R(inv, d_pack, d_out), "BeamCenterFFT: inverse transform failed");
+
+    std::vector<float> host(static_cast<size_t>(4 * nfft));
+    Check(cudaMemcpy(host.data(), d_out.get(), host.size() * sizeof(float),
+                     cudaMemcpyDeviceToHost),
+          "BeamCenterFFT: line surface download failed");
+
+    const double norm = 1.0 / static_cast<double>(nfft);
+    auto take = [&](int k) {
+        std::vector<double> v(static_cast<size_t>(2 * nseq));
+        for (int64_t i = 0; i < 2 * nseq; i++)
+            v[static_cast<size_t>(i)] = host[static_cast<size_t>(k * nfft + i)] * norm;
+        return v;
+    };
+    out.C = take(0);
+    out.S = take(1);
+    out.Q = take(2);
+    out.D = take(3);
+    return out;
+}
+
+size_t BeamCenterFFTGPU::DeviceMemoryNeeded(int64_t width, int64_t height) {
+    const int64_t ny = BeamCenterFFTPadSize(2 * height);
+    const int64_t nx = BeamCenterFFTPadSize(2 * width);
+    const int64_t nxc = nx / 2 + 1;
+    size_t work_fwd = 0, work_inv = 0;
+    cufftEstimate2d(static_cast<int>(ny), static_cast<int>(nx), CUFFT_R2C, &work_fwd);
+    cufftEstimate2d(static_cast<int>(ny), static_cast<int>(nx), CUFFT_C2R, &work_inv);
+    // One transform buffer, three spectra, and three of the four convolution surfaces - the
+    // fourth stays in the transform buffer, where the last inverse leaves it.
+    size_t needed = ny * nx * sizeof(float) + 3 * ny * nxc * sizeof(cufftComplex)
+                    + 3 * 4 * static_cast<size_t>(width) * height * sizeof(float) + work_fwd
+                    + work_inv;
+
+    // The two 1D phases, the larger of them: they run after the point surfaces, with its buffers
+    // already freed.
+    for (int pass = 0; pass < 2; pass++) {
+        const int64_t nseq = pass == 0 ? height : width;
+        const int64_t nbatch = pass == 0 ? width : height;
+        const int64_t nfft = BeamCenterFFTPadSize(2 * nseq);
+        const int64_t nc = nfft / 2 + 1;
+        std::vector<int> n = Dims(nfft), embed_real = Dims(nfft), embed_complex = Dims(nc);
+        size_t work = 0;
+        cufftEstimateMany(1, n.data(), embed_real.data(), 1, static_cast<int>(nfft),
+                          embed_complex.data(), 1, static_cast<int>(nc), CUFFT_R2C,
+                          static_cast<int>(nbatch), &work);
+        const size_t line = (height * width + nfft * nbatch) * sizeof(float)
+                            + 3 * nbatch * nc * sizeof(cufftComplex) + work;
+        needed = std::max(needed, line);
+    }
+    return needed;
+}
+
+bool BeamCenterFFTGPU::FitsInDeviceMemory(int64_t width, int64_t height) {
+    size_t free_bytes = 0, total_bytes = 0;
+    if (cudaMemGetInfo(&free_bytes, &total_bytes) != cudaSuccess)
+        return false;
+    // Headroom for the allocator's own rounding, and for whatever else lands on a shared card
+    // between this question and the allocations it is asked about.
+    constexpr size_t HEADROOM = 512ull << 20;
+    return DeviceMemoryNeeded(width, height) + HEADROOM <= free_bytes;
+}
diff --git a/image_analysis/geom_refinement/BeamCenterFFTGPU.h b/image_analysis/geom_refinement/BeamCenterFFTGPU.h
new file mode 100644
index 000000000..f47d8eb81
--- /dev/null
+++ b/image_analysis/geom_refinement/BeamCenterFFTGPU.h
@@ -0,0 +1,49 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+// Included only where CUDA is known to be present, i.e. under JFJOCH_USE_CUDA - the same rule as
+// FFTIndexerGPU.h. Deliberately free of CUDA headers so a host translation unit (the parity test)
+// can construct the engine.
+
+#include "BeamCenterFFTEngine.h"
+
+// The beam-centre transforms on cuFFT. The capture is one call per run on an image of tens of
+// megapixels, so plans and device buffers are created inside the call that needs them and freed
+// when it returns: the card is shared with the analysis workers, and a plan held across the run
+// would be several hundred megabytes doing nothing.
+class BeamCenterFFTGPU : public BeamCenterFFTEngine {
+public:
+    BeamCenterConvSurfaces2D PointSurfaces(const std::vector<float> &a, const std::vector<float> &m,
+                                           int64_t h, int64_t w) override;
+    BeamCenterConvSurfaces1D LineSurfaces(const std::vector<float> &a, const std::vector<float> &m,
+                                          int64_t h, int64_t w, BeamCenterMirror mirror) override;
+
+    // The four convolutions are combined and searched where they already are, so the only thing
+    // that crosses PCIe is the shortlist. On a 16 Mpixel detector that is 1.16 GB of surfaces, a
+    // 1.4 s greedy search and a 0.4 s combination not done on the host - against 26 ms of
+    // transform, which is what the host work had become.
+    std::vector<BeamCenterFFTCandidate> PointShortlist(const std::vector<float> &a,
+                                                       const std::vector<float> &m, int64_t h,
+                                                       int64_t w,
+                                                       const BeamCenterFFTSettings &settings,
+                                                       double global_variance) override;
+
+    // The scored surface itself, brought back. Nothing in the pipeline asks for it - the shortlist
+    // is made on the device - but the parity test holds the device combination to
+    // BeamCenterPointScore element by element, which is the sharpest comparison available once the
+    // two paths no longer share that step.
+    [[nodiscard]] std::vector<float> PointScoreSurface(const std::vector<float> &a,
+                                                       const std::vector<float> &m, int64_t h,
+                                                       int64_t w, float min_pair_fraction,
+                                                       double global_variance);
+
+    // Peak device memory the two phases need for an image of this size: buffers plus the cuFFT
+    // plans' own workspace.
+    [[nodiscard]] static size_t DeviceMemoryNeeded(int64_t width, int64_t height);
+    // Whether the visible device has that much free right now. The card is shared - with the
+    // analysis workers of this run and, on a development box, with whatever else is on it - so a
+    // capture that would not fit runs on the CPU instead of taking the card down with it.
+    [[nodiscard]] static bool FitsInDeviceMemory(int64_t width, int64_t height);
+};
diff --git a/image_analysis/geom_refinement/BeamCenterFromBackground.cpp b/image_analysis/geom_refinement/BeamCenterFromBackground.cpp
index 82e87ef86..9129589bc 100644
--- a/image_analysis/geom_refinement/BeamCenterFromBackground.cpp
+++ b/image_analysis/geom_refinement/BeamCenterFromBackground.cpp
@@ -38,12 +38,15 @@ constexpr int CLIP_ROUNDS = 2;
 constexpr float DAMPING = 0.5f;
 constexpr float CONVERGED_PXL = 0.02f;
 
-// The step is compared with the one before it, and a walk whose step reverses twice running has
-// crossed its fixed point rather than walked toward it: with DAMPING = 0.5 that happens where the
-// local gain exceeds 2, which is a period-2 limit cycle the walk will not leave. Instrumented, a
-// sweep that spent 96 of its 100 iterations in one oscillated by 0.08 px about a centre it knew to
-// 1.7 px. Travel does not reverse - a fit walking 339 px kept its step direction through all 22 of
-// its travelling iterations - so this ends the dithering without shortening the budget below.
+// The step is compared with the one before it, and a walk whose step CANCELS its predecessor twice
+// running has crossed its fixed point rather than walked toward it: with DAMPING = 0.5 that happens
+// where the local gain exceeds 2, which is a period-2 limit cycle the walk will not leave.
+// Instrumented, a sweep that spent 96 of its 100 iterations in one oscillated by 0.08 px about a
+// centre it knew to 1.7 px. Cancelling is the whole of it, and it is not the same as merely turning
+// by more than a right angle: a travelling walk wobbles, and on one sweep a single 0.56 px step
+// between 2 px ones turned twice in passing and ended the fit 118 px short of the centre the same
+// fit reaches from the other side - in one build and not another, because the sign of a dot product
+// between two near-orthogonal steps is set by the last ulp and not by the data.
 constexpr int REVERSALS_AT_THE_FIXED_POINT = 2;
 
 // A travel budget, not a convergence criterion. The shift a sector's regression can report is
@@ -53,9 +56,12 @@ constexpr int REVERSALS_AT_THE_FIXED_POINT = 2;
 // however far it still has to go. Ten iterations therefore cap the fit at about two hundred
 // pixels of travel and a centre further out than that is left part way there, still walking, with
 // the per-iteration precision reported as though it had arrived. The count is set to cross a
-// detector instead; a centre that is already close leaves on CONVERGED_PXL, or on the reversal
-// test above, after a handful.
-constexpr int MAX_ITERATIONS = 100;
+// detector and then converge on it; a centre that is already close leaves on CONVERGED_PXL, or on
+// the reversal test above, after a handful. Measured on a sweep whose centre is 170 px out: the
+// walk crawls at 1-2 px an iteration for its first forty, accelerates across the gap, and reaches
+// CONVERGED_PXL at 107-115 - so a budget of 100 stopped it in the last few pixels of its approach
+// and left where it stopped to the build.
+constexpr int MAX_ITERATIONS = 300;
 
 // The two passes over the pixels are split into this many row blocks, each accumulating into cells
 // of its own, and the blocks are folded in block order. The split is a property of the image and
@@ -76,7 +82,8 @@ float median_of(std::vector<float> &v) {
 
 std::optional<BeamCenterEstimate>
 FindBeamCenterFromBackground(const DiffractionExperiment &experiment, const PixelMask &mask,
-                             const std::vector<float> &mean, size_t nthreads) {
+                             const std::vector<float> &mean, size_t nthreads,
+                             std::optional<std::pair<float, float>> start) {
     if (nthreads == 0)
         nthreads = std::max(1u, std::thread::hardware_concurrency());
     const auto W = static_cast<int>(experiment.GetXPixelsNumConv());
@@ -100,8 +107,8 @@ FindBeamCenterFromBackground(const DiffractionExperiment &experiment, const Pixe
     const float pixel_size = geom.GetPixelSize_mm();
     const float distance = geom.GetDetectorDistance_mm();
 
-    float beam_x = geom.GetBeamX_pxl();
-    float beam_y = geom.GetBeamY_pxl();
+    float beam_x = start ? start->first : geom.GetBeamX_pxl();
+    float beam_y = start ? start->second : geom.GetBeamY_pxl();
 
     constexpr int n_cells = RADIAL_BINS * SECTORS;
     std::vector<int32_t> cell_of(n_pixels);
@@ -332,7 +339,9 @@ FindBeamCenterFromBackground(const DiffractionExperiment &experiment, const Pixe
         sigma_x = static_cast<float>(std::sqrt(c22 / det * chi2));
         sigma_y = static_cast<float>(std::sqrt(c11 / det * chi2));
 
-        reversals = (step_x * previous_x + step_y * previous_y < 0.0f) ? reversals + 1 : 0;
+        const bool cancels = std::hypot(step_x + previous_x, step_y + previous_y)
+                             < std::min(std::hypot(step_x, step_y), std::hypot(previous_x, previous_y));
+        reversals = cancels ? reversals + 1 : 0;
         previous_x = step_x;
         previous_y = step_y;
 
@@ -351,3 +360,38 @@ FindBeamCenterFromBackground(const DiffractionExperiment &experiment, const Pixe
     return BeamCenterEstimate{beam_x, beam_y,
                               std::max({sigma_x, sigma_y, std::hypot(step_x, step_y)})};
 }
+
+std::optional<BeamCenterEstimate>
+FindBeamCenter(const DiffractionExperiment &experiment, const PixelMask &mask,
+               const std::vector<float> &mean, size_t nthreads, BeamCenterFFTResult *capture) {
+    // The image the capture scores: the projection with everything the mask excludes taken out.
+    // The beam stop is in that mask by the time this runs, and it is the part that matters - an
+    // opaque region on one side of the beam is centrosymmetric about ITS own centre, and where it
+    // is large enough that preference beats the background's.
+    std::vector<float> scored = mean;
+    const auto &pixel_mask = mask.GetMask(experiment);
+    if (pixel_mask.size() == scored.size())
+        for (size_t i = 0; i < scored.size(); i++)
+            if (pixel_mask[i] != 0)
+                scored[i] = NAN;
+
+    const BeamCenterFFTResult fft = FindBeamCenterFFT(experiment, scored);
+    if (capture)
+        *capture = fft;
+    if (fft.point.empty())
+        return FindBeamCenterFromBackground(experiment, mask, mean, nthreads);
+
+    const std::pair<float, float> seed{fft.point[0].beam_x_pxl, fft.point[0].beam_y_pxl};
+    if (auto refined = FindBeamCenterFromBackground(experiment, mask, mean, nthreads, seed))
+        return refined;
+
+    // The walk has nothing to fit AT THE CAPTURE. That is a statement about the capture as much as
+    // about the background: a centre far enough out leaves too few fully covered rings inside the
+    // fitted band for the profile to exist at all. Measured on one small-molecule set whose capture
+    // lands 536 px out - the walk from the file's centre answers there to 2.9 px, and taking the
+    // capture instead would have been the composition's only regression on the corpus. So ask the
+    // walk again where it used to be asked, and keep the capture only where neither start works.
+    if (auto from_file = FindBeamCenterFromBackground(experiment, mask, mean, nthreads))
+        return from_file;
+    return BeamCenterEstimate{seed.first, seed.second, BEAM_CENTER_CAPTURE_SIGMA_PXL};
+}
diff --git a/image_analysis/geom_refinement/BeamCenterFromBackground.h b/image_analysis/geom_refinement/BeamCenterFromBackground.h
index 7d9451818..350cb6ddd 100644
--- a/image_analysis/geom_refinement/BeamCenterFromBackground.h
+++ b/image_analysis/geom_refinement/BeamCenterFromBackground.h
@@ -4,8 +4,10 @@
 #pragma once
 
 #include <optional>
+#include <utility>
 #include <vector>
 
+#include "BeamCenterFFT.h"
 #include "../../common/DiffractionExperiment.h"
 #include "../../common/PixelMask.h"
 
@@ -34,6 +36,43 @@ struct BeamCenterEstimate {
 // `mean` is a per-pixel projection over a few tens of frames, NAN where no frame contributed.
 // nthreads = 0 asks for all hardware threads. The pixels are split into a fixed number of row
 // blocks whatever that count is, so the answer does not depend on it.
+//
+// `start` is where the walk begins; the centre in the file when it is not given. The walk advances
+// by a bounded distance per iteration, so where it starts decides how much of its budget is spent
+// travelling and - on a surface with more than one basin - which fixed point it can reach at all.
 std::optional<BeamCenterEstimate>
 FindBeamCenterFromBackground(const DiffractionExperiment &experiment, const PixelMask &mask,
-                             const std::vector<float> &mean, size_t nthreads = 0);
+                             const std::vector<float> &mean, size_t nthreads = 0,
+                             std::optional<std::pair<float, float>> start = {});
+
+// The precision of a centre that is the FFT capture alone, with no walk behind it. The capture is
+// a half-pixel grid position read off a surface, measured over 75 rotation datasets at a median
+// 3.2 px and a 90th percentile of 11 px from the truth, so this is what it knows the centre to -
+// a capture precision and not a fit precision. It is deliberately far above the ceiling the
+// callers adopt a centre on: a capture is evidence about where the beam is, not a measurement of
+// where it is.
+constexpr float BEAM_CENTER_CAPTURE_SIGMA_PXL = 5.0f;
+
+// The beam centre from the background, captured globally and then refined locally.
+//
+// The walk in FindBeamCenterFromBackground is a good local refiner and a poor searcher: it moves
+// one or two pixels per iteration, it is seeded at the centre in the file, and on a background
+// whose isotropy is broken it has a second basin to fall into. The FFT score is the opposite -
+// it evaluates EVERY candidate centre on the detector in one transform set, at a cost that does
+// not depend on how wrong the file is, but it returns a half-pixel grid position and no sigma.
+// Composing them takes the reach from one and the precision from the other: the capture chooses
+// the basin, the walk finishes inside it and reports what it knows the answer to.
+//
+// The shadow of the beam stop is blanked out of the image the capture scores. A one-sided opaque
+// region imposes a centrosymmetry of its own that can beat the background's - measured, an umbra
+// over 9.6 % of the detector put the capture 48 px out, and masking it put it back to 1.1 px,
+// while a random mask of the same area changed nothing.
+//
+// Where the walk declines at the capture the walk is asked again from the centre in the file, and
+// only where neither start gives it something to fit does the capture stand alone, at
+// BEAM_CENTER_CAPTURE_SIGMA_PXL - which is what lets a caller that only needs a hypothesis to test
+// still get one. Returns nothing only where the capture has no candidate either.
+std::optional<BeamCenterEstimate>
+FindBeamCenter(const DiffractionExperiment &experiment, const PixelMask &mask,
+               const std::vector<float> &mean, size_t nthreads = 0,
+               BeamCenterFFTResult *capture = nullptr);
diff --git a/image_analysis/geom_refinement/CMakeLists.txt b/image_analysis/geom_refinement/CMakeLists.txt
index fb19731fb..b004e8d4e 100644
--- a/image_analysis/geom_refinement/CMakeLists.txt
+++ b/image_analysis/geom_refinement/CMakeLists.txt
@@ -4,6 +4,11 @@ ADD_LIBRARY(JFJochGeomRefinement STATIC
         BeamCenterFromBackground.h
         BeamCenterFromSpots.cpp
         BeamCenterFromSpots.h
+        BeamCenterFFT.cpp
+        BeamCenterFFT.h
+        BeamCenterFFTEngine.h
+        BeamCenterFFTCPU.cpp
+        BeamCenterFFTCPU.h
         RingOptimizer.cpp
         RingOptimizer.h
         AssignSpotsToRings.cpp
@@ -27,4 +32,17 @@ ADD_LIBRARY(JFJochGeomRefinement STATIC
         LatticeReduction.h
 )
 
-TARGET_LINK_LIBRARIES(JFJochGeomRefinement Ceres::ceres Eigen3::Eigen JFJochCommon)
+# fftw3f: BeamCenterFFT scores every candidate centre with one transform set (always fetched,
+# same target the CPU FFT indexer links), and is the fallback wherever there is no GPU.
+TARGET_LINK_LIBRARIES(JFJochGeomRefinement Ceres::ceres Eigen3::Eigen JFJochCommon fftw3f)
+
+IF (JFJOCH_CUDA_AVAILABLE)
+    TARGET_SOURCES(JFJochGeomRefinement PRIVATE BeamCenterFFTGPU.cu BeamCenterFFTGPU.h)
+    # Same static/dynamic cuFFT choice as the FFT indexer, and for the same reasons - see the long
+    # note in image_analysis/indexing/CMakeLists.txt.
+    IF (JFJOCH_PORTABLE_ONLY AND TARGET CUDA::cufft_static)
+        TARGET_LINK_LIBRARIES(JFJochGeomRefinement CUDA::cufft_static)
+    ELSE()
+        TARGET_LINK_LIBRARIES(JFJochGeomRefinement CUDA::cufft)
+    ENDIF()
+ENDIF()
diff --git a/image_analysis/geom_refinement/PostRefine.cpp b/image_analysis/geom_refinement/PostRefine.cpp
index 6ef913795..b34ce7469 100644
--- a/image_analysis/geom_refinement/PostRefine.cpp
+++ b/image_analysis/geom_refinement/PostRefine.cpp
@@ -43,6 +43,21 @@ constexpr double BEAM_BOUND_PXL = 15.0;
 // +-2.86 deg box the solver works in, so the box reaches everywhere the gate accepts.
 constexpr double ANGLE_BOUND_DEG = 1.0;
 
+// How far ONE step of the joint fit may move the detector distance or a cell length. This was a cap
+// on the whole fit, and as a cap it was the opposite of its job: the header is most worth correcting
+// when it is most wrong, and it threw away fits that were right (measured on a crystal whose refused
+// 1.39 % move landed on the deposited cell to 0.06 %). What it is still for - a fit corrupted by
+// something every cross-validation fold shares, a second lattice most often, which the relative "the
+// held-out residual improved" gate cannot see - is kept by making it a TRUST REGION on the step: a
+// solve reaches at most this far, and a fit that wants more takes another step from there. A move of
+// more than one step is then ratified by re-indexing at it, which is what actually tells a second
+// lattice from a wrong header (see PostRefineResult::large_move).
+constexpr double STEP_BOUND = 0.01;
+
+// ... and the walk is bounded, so a fit that never settles still terminates. Five steps is the +-5 %
+// box the solver was always given on the distance, i.e. as far as this fit has ever been trusted.
+constexpr int MAX_STEPS = 5;
+
 // One integrated partial, flattened across all images. Kept as narrow as the sort and the event
 // split allow: on a large cell this array is gigabytes, and the scatter and every level of the
 // per-bucket sort move all of it. The goniometer angle is not stored - it is a function of the
@@ -491,14 +506,14 @@ PostRefineResult PostRefineRotationGeometry(const std::vector<IntegrationOutcome
                 return (np + ne) ? (cp + ce) / static_cast<double>(np + ne) : 0.0;
             };
 
-            // One problem, both residual families, every block seeded at nominal. The detector tilt is
-            // declared and held constant so that a non-zero rot1/rot2 still acts on the observed side.
-            auto solve_joint = [&](Subset s, double bm[2], double ds[1], double rv[3],
+            // One problem, both residual families, every block seeded at the geometry it is handed -
+            // nominal for the first step of the walk below, the last step's answer after that. The
+            // detector tilt is declared and held constant so that a non-zero rot1/rot2 still acts on
+            // the observed side.
+            auto solve_joint = [&](Subset s, bool wide, double bm[2], double ds[1], double rv[3],
                                    double q0[3], double q1[3], double q2[3]) {
-                bm[0] = beam_x0; bm[1] = beam_y0; ds[0] = dist0;
-                for (int j = 0; j < 3; ++j) {
-                    rv[j] = ax0[j]; q0[j] = p0_0[j]; q1[j] = p1_0[j]; q2[j] = p2_0[j];
-                }
+                const double ds_seed = ds[0];
+                const double q1_seed[3] = {q1[0], q1[1], q1[2]};
                 ceres::Problem p;
                 for (size_t oi = 0; oi < n_obs; ++oi) {
                     const Partial *pp = obs[oi];
@@ -519,20 +534,30 @@ PostRefineResult PostRefineRotationGeometry(const std::vector<IntegrationOutcome
                 if (p.NumResidualBlocks() == 0) return false;
                 p.SetParameterBlockConstant(det_rot);
                 if (!p2_free) p.SetParameterBlockConstant(q2);
-                p.SetParameterLowerBound(ds, 0, dist0 * 0.95); p.SetParameterUpperBound(ds, 0, dist0 * 1.05);
-                // The box has to reach everywhere the gate below would accept, or the gate is never the
-                // thing that decides: a fit pinned at a box face lands exactly ON the bound and is then
-                // refused for being there.
+                // Two boxes on the distance and the cell lengths. WIDE is the one this fit has always
+                // had, around nominal: it is what the first solve is asked in, so a fit that settles
+                // inside the bound is the fit this code has always committed. Otherwise the box is one
+                // STEP around wherever this solve starts - the trust region the walk below steps in.
+                // The beam, the axis and the cell angles keep their own absolute bounds around NOMINAL
+                // either way, since a box that travelled with the seed would let them drift a whole
+                // bound per step. Each of those has to reach everywhere the gate below would accept, or
+                // the gate is never the thing that decides - a fit pinned at a box face lands exactly ON
+                // the bound and is then refused for being there.
+                p.SetParameterLowerBound(ds, 0, wide ? dist0 * 0.95 : ds_seed * (1.0 - STEP_BOUND));
+                p.SetParameterUpperBound(ds, 0, wide ? dist0 * 1.05 : ds_seed * (1.0 + STEP_BOUND));
                 for (int j = 0; j < 2; ++j) {
-                    const double m = settings.measured_beam_px ? (*settings.measured_beam_px)[j] : bm[j];
-                    p.SetParameterLowerBound(bm, j, std::min(bm[j], m) - BEAM_BOUND_PXL);
-                    p.SetParameterUpperBound(bm, j, std::max(bm[j], m) + BEAM_BOUND_PXL);
+                    const double b0 = (j == 0) ? beam_x0 : beam_y0;
+                    const double m = settings.measured_beam_px ? (*settings.measured_beam_px)[j] : b0;
+                    p.SetParameterLowerBound(bm, j, std::min(b0, m) - BEAM_BOUND_PXL);
+                    p.SetParameterUpperBound(bm, j, std::max(b0, m) + BEAM_BOUND_PXL);
                 }
                 for (int j = 0; j < 3; ++j) {
                     p.SetParameterLowerBound(rv, j, ax0[j] - 0.05);
                     p.SetParameterUpperBound(rv, j, ax0[j] + 0.05);
-                    p.SetParameterLowerBound(q1, j, 0.97 * p1_0[j]);
-                    p.SetParameterUpperBound(q1, j, 1.03 * p1_0[j]);
+                    p.SetParameterLowerBound(q1, j, wide ? 0.97 * p1_0[j]
+                                                         : (1.0 - STEP_BOUND) * q1_seed[j]);
+                    p.SetParameterUpperBound(q1, j, wide ? 1.03 * p1_0[j]
+                                                         : (1.0 + STEP_BOUND) * q1_seed[j]);
                 }
                 if (p2_free)
                     for (int j = 0; j < 3; ++j) {
@@ -551,30 +576,78 @@ PostRefineResult PostRefineRotationGeometry(const std::vector<IntegrationOutcome
             if (n_obs >= static_cast<size_t>(settings.min_events)) {
                 double pos_nom = 0.0, exc_nom = 0.0, pos_ref = 0.0, exc_ref = 0.0;
                 const double cv_nom = joint_cost(VAL, beam, dist, axv, p0, p1, p2, pos_nom, exc_nom);
-                double bm_f[2], ds_f[1], rv_f[3], q0_f[3], q1_f[3], q2_f[3];
-                const bool convJ = solve_joint(FIT, bm_f, ds_f, rv_f, q0_f, q1_f, q2_f);
-                const double cv_ref = joint_cost(VAL, bm_f, ds_f, rv_f, q0_f, q1_f, q2_f, pos_ref, exc_ref);
 
-                // Commit only for a small, credible move: distance < 1 % (a calibrated header needs
-                // < ~0.6 %), each cell length < 1 %, each free cell angle < 1 deg (ANGLE_BOUND_DEG), and
-                // the beam inside the bound measured from whichever centre anything already believes is
-                // nearer. A larger move is the red flag for an unreliable fit - typically a second
-                // lattice whose spots bias every cross-validation fold identically, so the relative "it
-                // improved" gate is blind to it. The absolute size of the move discriminates a genuine
-                // header correction from that failure far better than the absolute residual, which real
-                // marginal (noisy / iced) data shares with it. Names the test it failed, or nullptr.
-                const auto out_of_bounds = [&](const double bm[2], const double ds[1],
-                                               const double q1c[3], const double q2c[3]) -> const char * {
-                    if (std::fabs(ds[0] - dist0) >= 0.01 * dist0)
-                        return "the distance moved more than 1 %";
-                    double len_shift = 0.0, ang_shift = 0.0;
-                    for (int j = 0; j < 3; ++j) {
+                // How far a geometry has moved from nominal, in units of one step.
+                const auto beyond_a_step = [&](const double ds[1], const double q1c[3]) {
+                    double len_shift = 0.0;
+                    for (int j = 0; j < 3; ++j)
                         len_shift = std::max(len_shift,
                                              std::fabs(q1c[j] - p1_0[j]) / std::max(1e-9, p1_0[j]));
-                        ang_shift = std::max(ang_shift, std::fabs(q2c[j] - p2_0[j]));
+                    return std::fabs(ds[0] - dist0) >= STEP_BOUND * dist0 || len_shift >= STEP_BOUND;
+                };
+
+                // Ask the fit the way it has always been asked: ONE solve, seeded at nominal, in the
+                // wide box. A move that stays inside the bound is the fit this code has always
+                // committed and is committed unchanged - which is every crystal on the corpus but a
+                // handful, so nothing else about their runs moves either.
+                double bm_f[2] = {beam_x0, beam_y0}, ds_f[1] = {dist0};
+                double rv_f[3], q0_f[3], q1_f[3], q2_f[3];
+                for (int j = 0; j < 3; ++j) {
+                    rv_f[j] = ax0[j]; q0_f[j] = p0_0[j]; q1_f[j] = p1_0[j]; q2_f[j] = p2_0[j];
+                }
+                bool convJ = solve_joint(FIT, /*wide=*/true, bm_f, ds_f, rv_f, q0_f, q1_f, q2_f);
+                double cv_ref = convJ ? joint_cost(VAL, bm_f, ds_f, rv_f, q0_f, q1_f, q2_f,
+                                                   pos_ref, exc_ref)
+                                      : cv_nom;
+                int steps = 1;
+
+                // A larger move is no longer refused for its size - but it is not taken as one solve
+                // asserted it either. It is re-fitted as a WALK: each step seeded where the last one
+                // arrived, each bounded by the trust region, and each required to lower the held-out
+                // residual, so the size is arrived at by a sequence of checked steps. The walk stops
+                // when a step stops paying, which is the same cross-validated quantity the commit gate
+                // decides on rather than a new rule, and a walk that never stops is refused below.
+                const bool walked = convJ && beyond_a_step(ds_f, q1_f);
+                if (walked) {
+                    bm_f[0] = beam_x0; bm_f[1] = beam_y0; ds_f[0] = dist0;
+                    for (int j = 0; j < 3; ++j) {
+                        rv_f[j] = ax0[j]; q0_f[j] = p0_0[j]; q1_f[j] = p1_0[j]; q2_f[j] = p2_0[j];
                     }
-                    if (len_shift >= 0.01)
-                        return "a cell length moved more than 1 %";
+                    convJ = false; cv_ref = cv_nom; steps = 0;
+                    for (int step = 0; step < MAX_STEPS; ++step) {
+                        double bm_s[2] = {bm_f[0], bm_f[1]}, ds_s[1] = {ds_f[0]};
+                        double rv_s[3], q0_s[3], q1_s[3], q2_s[3];
+                        for (int j = 0; j < 3; ++j) {
+                            rv_s[j] = rv_f[j]; q0_s[j] = q0_f[j]; q1_s[j] = q1_f[j]; q2_s[j] = q2_f[j];
+                        }
+                        if (!solve_joint(FIT, /*wide=*/false, bm_s, ds_s, rv_s, q0_s, q1_s, q2_s))
+                            break;
+                        double pos_s = 0.0, exc_s = 0.0;
+                        const double cv_s = joint_cost(VAL, bm_s, ds_s, rv_s, q0_s, q1_s, q2_s,
+                                                       pos_s, exc_s);
+                        if (step > 0 && !(cv_s < cv_ref))
+                            break;
+                        bm_f[0] = bm_s[0]; bm_f[1] = bm_s[1]; ds_f[0] = ds_s[0];
+                        for (int j = 0; j < 3; ++j) {
+                            rv_f[j] = rv_s[j]; q0_f[j] = q0_s[j]; q1_f[j] = q1_s[j]; q2_f[j] = q2_s[j];
+                        }
+                        cv_ref = cv_s; pos_ref = pos_s; exc_ref = exc_s;
+                        convJ = true;
+                        ++steps;
+                    }
+                }
+
+                // Commit only for a credible move: each free cell angle under 1 deg (ANGLE_BOUND_DEG)
+                // and the beam inside the bound measured from whichever centre anything already
+                // believes is nearer. The distance and the cell lengths are no longer bounded here -
+                // they are bounded one step at a time by the walk above, and a move of more than one
+                // step is ratified by re-indexing at where it arrived (result.large_move), which is the
+                // discriminator the size of the move was standing in for. Names the test it failed, or
+                // nullptr.
+                const auto out_of_bounds = [&](const double bm[2], const double q2c[3]) -> const char * {
+                    double ang_shift = 0.0;
+                    for (int j = 0; j < 3; ++j)
+                        ang_shift = std::max(ang_shift, std::fabs(q2c[j] - p2_0[j]));
                     if (ang_shift >= ANGLE_BOUND_DEG * PI / 180.0)
                         return "a cell angle moved more than 1 deg";
                     const double from_nominal = std::hypot(bm[0] - beam_x0, bm[1] - beam_y0);
@@ -594,10 +667,17 @@ PostRefineResult PostRefineRotationGeometry(const std::vector<IntegrationOutcome
                 // quantity the cell is committed for has got worse. Neither may degrade.
                 const char *refused =
                         !convJ                        ? "the fit did not converge"
+                        // A walk that used every step it was given never settled: it stopped because it
+                        // ran out of steps, not because it had arrived, and where that happens it is
+                        // walking away rather than to something. This is the runaway the size of the
+                        // move used to stand in for, tested where it can actually be seen - measured on
+                        // a weak 7 A crystal whose fit asked for another 1 % at every one of five steps
+                        // and 4.3 % in all, against the 1.2 % its cell is actually out by.
+                        : steps >= MAX_STEPS          ? "the fit used every step it was given and never settled"
                         : !(cv_ref < 0.98 * cv_nom)   ? "the held-out residual did not improve enough"
                         : !(pos_ref < pos_nom)        ? "the held-out positional residual did not improve"
                         : !(exc_ref < exc_nom)        ? "the held-out excitation residual did not improve"
-                                                      : out_of_bounds(bm_f, ds_f, q1_f, q2_f);
+                                                      : out_of_bounds(bm_f, q2_f);
 
                 // What the half that was held out earned the right to fit is re-fitted on all of it, and
                 // that second solve moves the geometry - so the bounds are asked again of what will
@@ -607,10 +687,19 @@ PostRefineResult PostRefineRotationGeometry(const std::vector<IntegrationOutcome
                 double q1_log[3], q2_log[3];
                 for (int j = 0; j < 3; ++j) { q1_log[j] = q1_f[j]; q2_log[j] = q2_f[j]; }
                 if (refused == nullptr) {
-                    solve_joint(ALL, beam, dist, axv, p0, p1, p2);   // commit: re-fit on all data
+                    // A walk is re-fitted from where it arrived, one step wide, so the re-fit is its
+                    // last step taken over all the data rather than the whole walk taken again on it.
+                    // Everything else is re-fitted from nominal in the wide box, exactly as before.
+                    if (walked) {
+                        beam[0] = bm_f[0]; beam[1] = bm_f[1]; dist[0] = ds_f[0];
+                        for (int j = 0; j < 3; ++j) {
+                            axv[j] = rv_f[j]; p0[j] = q0_f[j]; p1[j] = q1_f[j]; p2[j] = q2_f[j];
+                        }
+                    }
+                    solve_joint(ALL, !walked, beam, dist, axv, p0, p1, p2);   // commit: re-fit on all data
                     ds_log[0] = dist[0]; bm_log[0] = beam[0]; bm_log[1] = beam[1];
                     for (int j = 0; j < 3; ++j) { q1_log[j] = p1[j]; q2_log[j] = p2[j]; }
-                    refused = out_of_bounds(beam, dist, p1, p2);
+                    refused = out_of_bounds(beam, p2);
                     if (refused != nullptr) {
                         beam[0] = beam_x0; beam[1] = beam_y0; dist[0] = dist0;
                         for (int j = 0; j < 3; ++j) {
@@ -623,8 +712,10 @@ PostRefineResult PostRefineRotationGeometry(const std::vector<IntegrationOutcome
                 // comes out is the same in all of them, so a run that silently keeps its header geometry
                 // says nothing about whether the fit was bad, the improvement too small, or the move too
                 // large for the bound - which is the one case where the number worth reading is the one
-                // that was thrown away.
-                const std::string verdict = commit ? std::string("COMMIT")
+                // that was thrown away. The report carries the same sentence, so a refusal is visible
+                // without the log.
+                const std::string verdict = commit ? fmt::format("COMMIT ({} step{})", steps,
+                                                                 steps == 1 ? "" : "s")
                                                    : "reject (" + std::string(refused) + ")";
                 // The cell the log names is the EFFECTIVE one - what the residual's B matrix builds
                 // from the blocks - not the blocks themselves, whose unused components a high-symmetry
@@ -645,6 +736,14 @@ PostRefineResult PostRefineRotationGeometry(const std::vector<IntegrationOutcome
                             len_fit[0], len_fit[1], len_fit[2],
                             ang_fit[0] * 180.0 / PI, ang_fit[1] * 180.0 / PI, ang_fit[2] * 180.0 / PI,
                             pos_nom, pos_ref, exc_nom, exc_ref, verdict);
+                if (!commit)
+                    result.refused_reason = fmt::format(
+                            "{} - it wanted {:.3f} mm and cell {:.3f} {:.3f} {:.3f}", refused,
+                            ds_log[0], len_fit[0], len_fit[1], len_fit[2]);
+                // A move of more than one step is a walk, not a correction next to where it started,
+                // and it is the one the old bound refused outright. It is committed here and ratified
+                // where it can be: by re-indexing at it (see RunAllPasses).
+                result.large_move = commit && beyond_a_step(dist, p1);
             } else {
                 logger.Info("Post-refine GEOM: only {} positional observations - the joint fit needs the "
                             "spot positions as well as the rocking angles, so nothing is refined", n_obs);
diff --git a/image_analysis/geom_refinement/PostRefine.h b/image_analysis/geom_refinement/PostRefine.h
index b3cf0a707..9e67caf03 100644
--- a/image_analysis/geom_refinement/PostRefine.h
+++ b/image_analysis/geom_refinement/PostRefine.h
@@ -5,6 +5,7 @@
 
 #include <array>
 #include <optional>
+#include <string>
 #include <vector>
 
 #include "../../common/DiffractionGeometry.h"
@@ -40,6 +41,15 @@ struct PostRefineResult {
     // together - so these two are always equal. Both are kept because the report names them separately.
     bool cell_refined = false;                // the joint fit passed cross-validation (crystal half)
     bool detector_refined = false;            // the joint fit passed cross-validation (detector half)
+    // The fit moved the distance or a cell length by more than one step of its trust region (see
+    // STEP_BOUND in PostRefine.cpp), so it walked rather than settling beside the geometry it started
+    // from. Such a move is not refused for its size - it is RATIFIED by re-integrating and re-indexing
+    // at it, which a second lattice does not survive and a wrong header does (see RunAllPasses).
+    bool large_move = false;
+    // Which test refused the fit and what it wanted, where it was refused; empty where it committed.
+    // Nothing else says it - the geometry that comes out of a refusal is the nominal one whatever
+    // refused it, so a silent refusal cannot be told from a fit that never wanted to move.
+    std::string refused_reason;
     // GONIOMETER ROTATION SCALE: the factor by which the stage actually turned relative to the angle
     // stored in the file (which is the COMMANDED value, hence a stage calibration error is invisible in
     // the header). Fitted after the joint fit as a single free parameter, with the crystal and the axis
diff --git a/image_analysis/geom_refinement/XtalOptimizer.cpp b/image_analysis/geom_refinement/XtalOptimizer.cpp
index dca95df18..58b049e10 100644
--- a/image_analysis/geom_refinement/XtalOptimizer.cpp
+++ b/image_analysis/geom_refinement/XtalOptimizer.cpp
@@ -633,7 +633,7 @@ bool XtalOptimizer(XtalOptimizerData &data, std::span<const std::vector<SpotToSa
             if (!spots[i].empty())
                 weights[i] = SpotConfidenceWeights(spots[i]);
 
-    if (!XtalOptimizerInternal(data, spots, weights, 0.3, num_threads))
+    if (!XtalOptimizerInternal(data, spots, weights, XTAL_OPTIMIZER_WIDE_TOLERANCE, num_threads))
         return false;
     XtalOptimizerInternal(data, spots, weights, 0.2, num_threads);
     return XtalOptimizerInternal(data, spots, weights, 0.1, num_threads);
diff --git a/image_analysis/geom_refinement/XtalOptimizer.h b/image_analysis/geom_refinement/XtalOptimizer.h
index cbcc78636..1bf9084de 100644
--- a/image_analysis/geom_refinement/XtalOptimizer.h
+++ b/image_analysis/geom_refinement/XtalOptimizer.h
@@ -72,4 +72,7 @@ bool XtalOptimizer(XtalOptimizerData &data, std::span<const std::vector<SpotToSa
 bool XtalOptimizer(XtalOptimizerData &data, const std::vector<SpotToSave> &spots, int num_threads = 1);
 bool XtalOptimizerRotationOnly(XtalOptimizerData &data, const std::vector<SpotToSave> &spots, float tolerance);
 
-
+// The widest of the three fractional-index gates XtalOptimizer fits through. Its first pass selects
+// spots on this one and its last pass on 0.1, so the spots between the two are carried into the fit
+// and then dropped from it: this is the population a converged solve does NOT optimise.
+constexpr float XTAL_OPTIMIZER_WIDE_TOLERANCE = 0.3f;
diff --git a/image_analysis/indexing/AnalyzeIndexing.cpp b/image_analysis/indexing/AnalyzeIndexing.cpp
index a7adc108b..5b39c192e 100644
--- a/image_analysis/indexing/AnalyzeIndexing.cpp
+++ b/image_analysis/indexing/AnalyzeIndexing.cpp
@@ -341,7 +341,8 @@ namespace {
 bool AnalyzeIndexing(DataMessage &message,
                      const DiffractionExperiment &experiment,
                      const CrystalLattice &latt,
-                     const std::vector<CrystalLattice> &extra_lattices) {
+                     const std::vector<CrystalLattice> &extra_lattices,
+                     int64_t *spots_on_lattice) {
     auto start_time = std::chrono::steady_clock::now();
 
     std::vector<uint8_t> indexed_spots(message.spots.size());
@@ -407,6 +408,9 @@ bool AnalyzeIndexing(DataMessage &message,
         }
     }
 
+    if (spots_on_lattice)
+        *spots_on_lattice = static_cast<int64_t>(nspots_indexed);
+
     // Reference count for the indexed-fraction test = spots within the resolution range that this
     // lattice actually diffracts to (out to the highest-resolution indexed spot). Spots beyond that
     // limit are noise: these weakly-diffracting crystals reach only ~4 A while the detector spans
diff --git a/image_analysis/indexing/AnalyzeIndexing.h b/image_analysis/indexing/AnalyzeIndexing.h
index 3fb2d1f1b..e20b05f6d 100644
--- a/image_analysis/indexing/AnalyzeIndexing.h
+++ b/image_analysis/indexing/AnalyzeIndexing.h
@@ -46,9 +46,14 @@ constexpr float SPOT_BUDGET_SIGNIFICANCE_Z = 3.29f;   // 2(1 - Phi(z)) = 0.001
 // same rate all the way down, and the case a bare argmax gets wrong.
 int64_t SpotBudgetFromEvidence(const std::vector<int64_t> &indexed, const std::vector<int64_t> &counted);
 
+// spots_on_lattice, when given, receives how many of this frame's non-ice spots lie on latt - the
+// numerator of the frame gate below, reported whatever the gate then decides. The rotation first
+// pass's acceptance test pools that count over its validation frames, so it needs it from the sparse
+// frames the gate refuses as much as from the ones it accepts.
 bool AnalyzeIndexing(DataMessage &message,
                      const DiffractionExperiment &experiment,
                      const CrystalLattice &latt,
-                     const std::vector<CrystalLattice> &extra_lattices = {});
+                     const std::vector<CrystalLattice> &extra_lattices = {},
+                     int64_t *spots_on_lattice = nullptr);
 
 
diff --git a/image_analysis/indexing/CMakeLists.txt b/image_analysis/indexing/CMakeLists.txt
index e1c88e219..31d363b3b 100644
--- a/image_analysis/indexing/CMakeLists.txt
+++ b/image_analysis/indexing/CMakeLists.txt
@@ -23,14 +23,15 @@ ADD_LIBRARY(JFJochIndexing STATIC
 TARGET_LINK_LIBRARIES(JFJochIndexing JFJochCommon JFJochLatticeSearch)
 
 IF (JFJOCH_CUDA_AVAILABLE)
-    # GIT_SUBMODULES "" -> do not fetch ffbidx's bundled eigen submodule; it would add_subdirectory
-    # a second Eigen3::Eigen target. ffbidx instead resolves Eigen via the project-level Eigen3
-    # (the find_package(Eigen3) at the top of image_analysis/CMakeLists.txt).
+    # A source archive carries no submodules, which is exactly what is wanted here: ffbidx's bundled
+    # eigen submodule must NOT be added, or it would add_subdirectory a second Eigen3::Eigen target.
+    # ffbidx instead resolves Eigen via the project-level Eigen3 (the find_package(Eigen3) at the top
+    # of image_analysis/CMakeLists.txt). The clone this replaces passed GIT_SUBMODULES "" to get the
+    # same tree.
     FetchContent_Declare(
             fast-indexer
-            GIT_REPOSITORY https://github.com/paulscherrerinstitute/fast-feedback-indexer/
-            GIT_TAG a94fd4f5c55289e70860feea358182d2072e02b5
-            GIT_SUBMODULES ""
+            URL https://github.com/paulscherrerinstitute/fast-feedback-indexer/archive/a94fd4f5c55289e70860feea358182d2072e02b5.tar.gz
+            URL_HASH SHA256=275590cb41db783b822b1c8403abc2b3c9986f3d98a1a7361fc0ad478ff466c0
     )
 
     FetchContent_MakeAvailable(fast-indexer)
diff --git a/image_analysis/lattice_search/LatticeSearch.cpp b/image_analysis/lattice_search/LatticeSearch.cpp
index fc8951821..b22a331c3 100644
--- a/image_analysis/lattice_search/LatticeSearch.cpp
+++ b/image_analysis/lattice_search/LatticeSearch.cpp
@@ -475,3 +475,60 @@ std::optional<LatticeSearchResult> LatticeSearchForClass(const CrystalLattice &L
     const std::pair<gemmi::CrystalSystem, char> only{system, centering};
     return SearchCharacters(L, dist_tolerance, angle_tolerance, &only);
 }
+
+double MetricDeviation(const LatticeSearchResult &sr) {
+    const UnitCell uc = sr.conventional.GetUnitCell();
+    double angle = 0.0, length = 0.0;
+    auto a_dev = [&](double x, double ideal) { angle = std::max(angle, std::fabs(x - ideal)); };
+    auto l_dev = [&](double x, double y) { length = std::max(length, std::fabs(x - y) / (0.5 * (x + y))); };
+    switch (sr.system) {
+        case gemmi::CrystalSystem::Monoclinic:   a_dev(uc.alpha, 90); a_dev(uc.gamma, 90); break;
+        case gemmi::CrystalSystem::Orthorhombic: a_dev(uc.alpha, 90); a_dev(uc.beta, 90); a_dev(uc.gamma, 90); break;
+        case gemmi::CrystalSystem::Tetragonal:   a_dev(uc.alpha, 90); a_dev(uc.beta, 90); a_dev(uc.gamma, 90);
+                                                 l_dev(uc.a, uc.b); break;
+        case gemmi::CrystalSystem::Trigonal:
+        case gemmi::CrystalSystem::Hexagonal:    a_dev(uc.alpha, 90); a_dev(uc.beta, 90); a_dev(uc.gamma, 120);
+                                                 l_dev(uc.a, uc.b); break;
+        case gemmi::CrystalSystem::Cubic:        a_dev(uc.alpha, 90); a_dev(uc.beta, 90); a_dev(uc.gamma, 90);
+                                                 l_dev(uc.a, uc.b); l_dev(uc.b, uc.c); break;
+        default: break;                          // triclinic: nothing is asserted, nothing is violated
+    }
+    return std::max(angle / LATTICE_SEARCH_ANGLE_TOLERANCE_DEG, length / LATTICE_SEARCH_DIST_TOLERANCE);
+}
+
+CrystalLattice SymmetrizeMetric(const CrystalLattice &L, const gemmi::SpaceGroup &sg) {
+    const Coord v[3] = {L.Vec0(), L.Vec1(), L.Vec2()};
+    Eigen::Matrix3d A;
+    for (int i = 0; i < 3; i++)
+        A.row(i) << v[i].x, v[i].y, v[i].z;
+
+    const Eigen::Matrix3d G = A * A.transpose();
+    // The rotations alone: a centring translation acts on the lattice points, not on the metric.
+    const auto &ops = sg.operations().sym_ops;
+    Eigen::Matrix3d G_sym = Eigen::Matrix3d::Zero();
+    for (const gemmi::Op &op : ops) {
+        Eigen::Matrix3d R;
+        for (int i = 0; i < 3; i++)
+            for (int j = 0; j < 3; j++)
+                R(i, j) = static_cast<double>(op.rot[i][j]) / gemmi::Op::DEN;
+        G_sym += R.transpose() * G * R;
+    }
+    G_sym /= static_cast<double>(ops.size());
+
+    // Symmetric square root of a positive-definite metric, or its inverse.
+    const auto root = [](const Eigen::Matrix3d &M, bool inverse) {
+        const Eigen::SelfAdjointEigenSolver<Eigen::Matrix3d> es(M);
+        Eigen::Vector3d d = es.eigenvalues().cwiseSqrt();
+        if (inverse)
+            d = d.cwiseInverse();
+        return Eigen::Matrix3d(es.eigenvectors() * d.asDiagonal() * es.eigenvectors().transpose());
+    };
+    // As a change of basis rather than three rebuilt vectors: the three-Coord constructor enforces a
+    // right-handed basis, and a lattice that arrives left-handed would come back with one axis flipped
+    // and its free angle replaced by the supplement (beta 132.23 -> 47.77, measured). A projection of
+    // the metric has no business changing the hand of the cell its reflections are indexed on.
+    const Eigen::Matrix3d M = root(G_sym, false) * root(G, true);
+    return L.Multiply(gemmi::Mat33(M(0, 0), M(0, 1), M(0, 2),
+                                   M(1, 0), M(1, 1), M(1, 2),
+                                   M(2, 0), M(2, 1), M(2, 2)));
+}
diff --git a/image_analysis/lattice_search/LatticeSearch.h b/image_analysis/lattice_search/LatticeSearch.h
index cdfd9b558..06f3dead8 100644
--- a/image_analysis/lattice_search/LatticeSearch.h
+++ b/image_analysis/lattice_search/LatticeSearch.h
@@ -29,9 +29,12 @@ struct LatticeSearchResult {
 // code that has to ask whether that is what happened compares against this very number.
 constexpr double LATTICE_SEARCH_DIST_TOLERANCE = 0.03;
 
+// The tolerance the same walk holds its ANGLE equalities to, in degrees.
+constexpr double LATTICE_SEARCH_ANGLE_TOLERANCE_DEG = 3.0;
+
 LatticeSearchResult LatticeSearch(const CrystalLattice& L,
                                   double dist_tolerance = LATTICE_SEARCH_DIST_TOLERANCE,
-                                  double angle_tolerance_deg = 3);
+                                  double angle_tolerance_deg = LATTICE_SEARCH_ANGLE_TOLERANCE_DEG);
 
 // The same 44-character walk, restricted to the characters of ONE Bravais class: the setting of L
 // that carries exactly (system, centering), or nothing when no character of that class fits the
@@ -43,5 +46,21 @@ LatticeSearchResult LatticeSearch(const CrystalLattice& L,
 std::optional<LatticeSearchResult> LatticeSearchForClass(const CrystalLattice& L,
                                                          gemmi::CrystalSystem system, char centering,
                                                          double dist_tolerance = LATTICE_SEARCH_DIST_TOLERANCE,
-                                                         double angle_tolerance_deg = 3);
+                                                         double angle_tolerance_deg = LATTICE_SEARCH_ANGLE_TOLERANCE_DEG);
 
+// How far the matched lattice's metric sits from the IDEAL metric of its class, as a fraction of the
+// tolerance that admitted it: 0 is exactly the class, 1 is the edge of what the walk accepts. The
+// walk computes this and throws it away - a cell 0.02 deg from being C-centred monoclinic and one
+// 0.74 deg from it are both reported as C-centred monoclinic, and on a free refinement the
+// difference between them is the difference between a lattice and one drifting away from a lattice.
+// A triclinic match has no condition to violate, so it is 0.
+double MetricDeviation(const LatticeSearchResult &sr);
+
+// The nearest lattice whose metric the rotations of `sg` leave invariant, with L's own orientation.
+// Averaging the metric tensor over the group is the projection onto the metrics it fixes, and
+// A' = G_sym^(1/2) G^(-1/2) A is the lattice carrying that metric in A's own orientation - the
+// smallest change to the cell that lets the group describe it at all. For a caller that has ADOPTED a
+// group on a cell no fit under that group ever produced: a C 1 2 1 whose alpha is 88.5 is not a cell
+// to report, whatever confirmed the two-fold. Where the spots can be asked instead - a constrained
+// re-refinement - they are the better answer; this is what is left when that is refused.
+CrystalLattice SymmetrizeMetric(const CrystalLattice &L, const gemmi::SpaceGroup &sg);
diff --git a/image_analysis/rotation_indexer/RotationIndexer.cpp b/image_analysis/rotation_indexer/RotationIndexer.cpp
index 046d30714..90845254a 100644
--- a/image_analysis/rotation_indexer/RotationIndexer.cpp
+++ b/image_analysis/rotation_indexer/RotationIndexer.cpp
@@ -131,7 +131,7 @@ void RotationIndexer::RunIndexing() {
         return;
 
     std::vector<Coord> coords;
-    coords.reserve(max_spots_per_image * v_.size());
+    coords.reserve(accumulated_spots);   // the exact count held; the per-image cap may be SIZE_MAX
 
     for (int i = 0; i < v_.size(); i++) {
         const float angle_deg = angle_deg_[i].value_or(axis_->GetAngle_deg(i) + axis_->GetWedge_deg() / 2.0f);
@@ -172,15 +172,7 @@ void RotationIndexer::RunIndexing() {
 
         // Re-accumulate the reciprocal spots under a refined geometry/axis, to score a refined cell.
         auto accumulate = [&](const DiffractionGeometry &g, const std::optional<GoniometerAxis> &ax) {
-            std::vector<Coord> c;
-            c.reserve(max_spots_per_image * v_.size());
-            for (int i = 0; i < v_.size(); i++) {
-                const float a = angle_deg_[i].value_or(ax->GetAngle_deg(i) + ax->GetWedge_deg() / 2.0f);
-                const auto rot = ax->GetTransformationAngle(a);
-                for (const auto &s : v_[i])
-                    c.emplace_back(rot * s.ReciprocalCoord(g));
-            }
-            return c;
+            return AccumulateReciprocal(g, ax);
         };
 
         // The FFT offers a few candidate cells (its best reduction plus, for large/elongated cells, a
@@ -414,9 +406,64 @@ void RotationIndexer::RunIndexing() {
         // pinning its anchor across the rounds instead leaves the tilt at 0.014 deg and the data worse
         // than doing nothing. The winner only: the other candidates are discarded, and these solves are
         // the dominant first-pass cost. Not in real time, where the budget is wall-clock.
+        //
+        // The chain is a trajectory, and its last point is not always its best one. Every solve ends
+        // by fitting only the spots inside its tightest gate (0.1), so a cell with a direction the
+        // data barely speak about - which is what a free cell whose metric is near a Bravais class
+        // has - can slide along that direction, pulling a core of spots tighter while the periphery
+        // falls out of the fit altogether. Measured on such a crystal: over seventeen rounds the
+        // spots inside the tight gate rise from 0.295 to 0.327 while the spots inside the wide one
+        // peak at round three (0.754) and fall to 0.730, and it is round three that merges - ISa 11.0
+        // against 6.3, R_meas 0.148 against 0.213 - and that agrees with the archived reference cell.
+        // Which round a build stopped on used to decide that, since the tilt step the loop tests is
+        // scatter at the size of its own bound.
+        //
+        // So score every round on the WIDE gate the last pass does not fit - the same 0.3 the solve's
+        // first pass selects on - and commit the best-scoring round rather than the one the loop
+        // happens to stop on. The comparison is between rounds of ONE chain, whose cell moves by a
+        // fraction of a percent, so it is not a test a bigger cell can win by being bigger.
+        //
+        // The score is a COUNT of spots, and a lead of fewer than sqrt(count) of them is smaller than
+        // the count's own noise - taking the round on one would hand the answer back to the last
+        // bits, which is the defect being removed. So the chain's last round stands unless another
+        // beats it by more than that, and the ordinary chain - which settles, and whose rounds then
+        // score within a spot or two of each other - commits exactly what it committed before. The
+        // bound is generous: both counts are made over the same spot list, so the difference of two
+        // rounds carries far less noise than sqrt of either.
+        //
+        // And the round taken has to be the less distorted lattice as well as the better-fitting one.
+        // Ask LatticeSearch for the class of each round's cell - to MEASURE the drift, not to impose
+        // the class, which is measured fatal - and take the earlier round only when it matched the
+        // SAME class and its metric sits closer to it. Same class, because the deviation is a
+        // fraction of the tolerance of whatever class the round matched, so two classes' deviations
+        // are not the same quantity - and a round that matched no class reports 0, which is not
+        // "undistorted" but "nothing was asserted". Comparing that against a class's deviation reads
+        // the absence of a constraint as the absence of distortion, and the veto silently switches
+        // off. Measured: it would do that on 11 of 1132 traced chains, four of them against a
+        // round that matched no class at all.
+        //
+        // A lattice's metric symmetry is exact, so among cells that all fit the data the least
+        // distorted one is the one the crystal has; a chain that is merely converging does not move
+        // its distortion (a symmetry-constrained solve holds it at zero throughout), so this fires on
+        // exactly the chains that are sliding out of a class and on no others. It is a veto and not
+        // the criterion: the spots have to prefer the round first, so this cannot pull an answer
+        // towards a symmetry the data do not support.
         constexpr int ROT_REFINE_OUTER_ROUNDS = 20;
         constexpr double ROT_REFINE_TILT_SETTLED_RAD = 1.0e-5;   // ~0.6 mdeg
         if (have_best && !real_time) {
+            auto wide_count = [&](const XtalOptimizerData &d) {
+                const auto c = accumulate(d.geom, d.axis);
+                return IndexedFraction(d.latt, c, XTAL_OPTIMIZER_WIDE_TOLERANCE) * static_cast<float>(c.size());
+            };
+            // True when a matched the same Bravais class as b and sits closer to its ideal metric.
+            auto less_distorted = [](const LatticeSearchResult &a, const LatticeSearchResult &b) {
+                return a.system == b.system && a.centering == b.centering
+                       && MetricDeviation(a) < MetricDeviation(b);
+            };
+            XtalOptimizerData kept = best_data;
+            float kept_count = -1.0f;
+            float last_count = 0.0f;
+            LatticeSearchResult kept_class, last_class;
             for (int r = 0; r < ROT_REFINE_OUTER_ROUNDS; ++r) {
                 XtalOptimizerData d = best_data;
                 if (!XtalOptimizer(d, v_, kCeresThreads))
@@ -424,9 +471,18 @@ void RotationIndexer::RunIndexing() {
                 const double d1 = std::abs(d.geom.GetPoniRot1_rad() - best_data.geom.GetPoniRot1_rad());
                 const double d2 = std::abs(d.geom.GetPoniRot2_rad() - best_data.geom.GetPoniRot2_rad());
                 best_data = std::move(d);
+                last_count = wide_count(best_data);
+                last_class = LatticeSearch(best_data.latt);
+                if (last_count >= kept_count) {
+                    kept_count = last_count;
+                    kept_class = last_class;
+                    kept = best_data;
+                }
                 if (std::max(d1, d2) < ROT_REFINE_TILT_SETTLED_RAD)
                     break;
             }
+            if (kept_count > last_count + std::sqrt(last_count) && less_distorted(kept_class, last_class))
+                best_data = std::move(kept);
             best_frac = IndexedFraction(best_data.latt, accumulate(best_data.geom, best_data.axis), index_tol);
         }
 
@@ -522,6 +578,62 @@ void RotationIndexer::ProcessImage(int64_t image, const std::vector<SpotToSave>
     accumulated_spots += v_[image].size();
 }
 
+std::vector<Coord> RotationIndexer::AccumulateReciprocal(const DiffractionGeometry &g,
+                                                         const std::optional<GoniometerAxis> &ax) const {
+    std::vector<Coord> c;
+    c.reserve(accumulated_spots);
+    for (int i = 0; i < v_.size(); i++) {
+        const float a = angle_deg_[i].value_or(ax->GetAngle_deg(i) + ax->GetWedge_deg() / 2.0f);
+        const auto rot = ax->GetTransformationAngle(a);
+        for (const auto &s : v_[i])
+            c.emplace_back(rot * s.ReciprocalCoord(g));
+    }
+    return c;
+}
+
+std::optional<RotationIndexer::ConstrainedRefit>
+RotationIndexer::RefineConstrained(const CrystalLattice &latt, gemmi::CrystalSystem system) const {
+    std::unique_lock ul(m);
+
+    if (!axis_ || accumulated_spots == 0 || latt.CalcVolume() <= 1.0)
+        return {};
+
+    const UnitCell uc = latt.GetUnitCell();
+    XtalOptimizerData d{
+        .geom = updated_geom_,
+        .latt = latt,
+        .crystal_system = system == gemmi::CrystalSystem::Trigonal ? gemmi::CrystalSystem::Hexagonal
+                                                                   : system,
+        .min_spots = experiment.GetIndexingSettings().GetViableCellMinSpots(),
+        .max_length_A = 1.2f * std::max({uc.a, uc.b, uc.c}),
+        // The indexers' bound, so a monoclinic beta outside [60,120] is refined and not clamped.
+        .min_angle_deg = 30.0f,
+        .max_angle_deg = 150.0f,
+        // The detector and the axis stay where the indexing left them - see the header.
+        .refine_beam_center = false,
+        .refine_detector_angles = false,
+        .refine_rotation_axis = false,
+        .index_ice_rings = index_ice_rings,
+        .max_iterations = real_time ? 0 : ROT_REFINE_ITERATIONS,
+        .axis = axis_
+    };
+
+    // One cloud for both scores: the geometry is held, so the lattice that comes out is scored on the
+    // same spots the one that went in is.
+    const auto cloud = AccumulateReciprocal(updated_geom_, axis_);
+    const float tol = experiment.GetIndexingSettings().GetTolerance();
+    const float before = IndexedFraction(latt, cloud, tol);
+
+    if (!XtalOptimizer(d, v_, 4))
+        return {};
+
+    return ConstrainedRefit{
+        .lattice = d.latt,
+        .indexed_fraction = IndexedFraction(d.latt, cloud, tol),
+        .indexed_fraction_before = before,
+    };
+}
+
 std::optional<RotationIndexerResult> RotationIndexer::GetLattice() const {
     std::unique_lock ul(m);
 
diff --git a/image_analysis/rotation_indexer/RotationIndexer.h b/image_analysis/rotation_indexer/RotationIndexer.h
index da24336a0..de7f6c264 100644
--- a/image_analysis/rotation_indexer/RotationIndexer.h
+++ b/image_analysis/rotation_indexer/RotationIndexer.h
@@ -31,7 +31,12 @@ class RotationIndexer {
     const DiffractionExperiment& experiment;
 
     constexpr static size_t max_spots = 10000;
-    constexpr static size_t max_spots_per_image = 200;
+    constexpr static size_t DEFAULT_MAX_SPOTS_PER_IMAGE = 200;
+    // How many of each image's spots join the accumulated cloud, strongest first and ring spots last
+    // (FilterSpotsByCount has already ordered them). The default is the bound this always had; the
+    // caller lowers it to seed the search on the strongest few, exactly as the per-frame indexer
+    // escalates 30 -> 80 -> all, for a pattern where the deep list is mostly not this crystal.
+    size_t max_spots_per_image = DEFAULT_MAX_SPOTS_PER_IMAGE;
 
     const bool index_ice_rings;
     const bool real_time;   // see the constructor
@@ -54,12 +59,19 @@ class RotationIndexer {
 
     std::optional<CrystalLattice> indexed_lattice;
     std::optional<std::string> indexer_error_;
+
+    // The accumulated per-image spots as one reciprocal-space cloud, back-rotated to phi = 0 under the
+    // given geometry and axis. The caller holds the lock.
+    [[nodiscard]] std::vector<Coord> AccumulateReciprocal(const DiffractionGeometry &g,
+                                                          const std::optional<GoniometerAxis> &ax) const;
 public:
     // real_time: bound the candidate-cell refinements by WALL CLOCK, as online acquisition must - it
     // has a real budget. Offline (rugnux, the viewer) passes false and they are bounded by iteration
     // count instead, so the same file reprocesses to the same cell regardless of what else the machine
     // was doing at the time.
     RotationIndexer(const DiffractionExperiment& x, IndexerThreadPool& indexer, bool real_time = false);
+    // Keep only this many spots per image in the accumulated cloud (strongest, non-ring first).
+    void MaxSpotsPerImage(size_t n) { max_spots_per_image = n > 0 ? n : DEFAULT_MAX_SPOTS_PER_IMAGE; }
     // angle_deg is the image's mid-exposure rotation angle; if omitted, the goniometer angle at
     // `image` is used (only valid when `image` is the goniometer's own image index).
     void ProcessImage(int64_t image, const std::vector<SpotToSave>& spots,
@@ -76,4 +88,25 @@ public:
     void ForceResult(const RotationIndexerResult& result);
     // True once the accumulation buffer is full (used to stop feeding a consecutive-frame scheme).
     [[nodiscard]] bool AccumulationFull() const;
+
+    // A lattice re-refined with its metric CONSTRAINED to one crystal system, and what the constraint
+    // costs on the spots that decided the free one.
+    struct ConstrainedRefit {
+        CrystalLattice lattice;
+        float indexed_fraction = 0.0f;          // the refined constrained lattice, over the accumulated cloud
+        float indexed_fraction_before = 0.0f;   // the lattice handed in, over the same cloud
+    };
+    // Re-refine `latt` under the metric constraint of `system`, against the same accumulated cloud the
+    // indexing ran on and at the geometry and axis it settled on. For a caller that has ADOPTED a
+    // symmetry this indexing never refined under: the intensities can confirm a two-fold the spot
+    // POSITIONS never offered - the Bravais class is decided on the unrefined candidate, and the free
+    // refinement can walk into a class afterwards - and such a caller then holds a cell in a group's
+    // setting whose metric is still the free fit's. The detector and the axis are held: by the time
+    // that question is asked the reflections have been integrated at that geometry, so what is being
+    // asked is which cell the spots support under the constraint, not where the detector is. The BASIS
+    // is held too - this never reindexes - so `latt` has to arrive in the setting the constraint is
+    // written in (unique axis b for monoclinic, as XtalResidual parameterises it); a caller that cannot
+    // guarantee that has to check the answer against its own group.
+    [[nodiscard]] std::optional<ConstrainedRefit> RefineConstrained(const CrystalLattice &latt,
+                                                                    gemmi::CrystalSystem system) const;
 };
diff --git a/image_analysis/scale_merge/Merge.cpp b/image_analysis/scale_merge/Merge.cpp
index 5e2a8ac7a..2aeebdb20 100644
--- a/image_analysis/scale_merge/Merge.cpp
+++ b/image_analysis/scale_merge/Merge.cpp
@@ -123,6 +123,9 @@ void MergeOnTheFly::AddImage(const IntegrationOutcome &outcome, int64_t image_id
         it->second.sum_w_half[half] += w;
         it->second.n_half[half]++;
 
+        if (r.on_ice_ring)
+            it->second.on_ice_ring = true;
+
         if (!std::isfinite(it->second.d) && std::isfinite(r.d) && r.d > 0.0f)
             it->second.d = r.d;
     }
@@ -369,7 +372,8 @@ std::vector<MergedReflection> MergeOnTheFly::ExportReflections() {
             .sigma = static_cast<float>(1.0 / std::sqrt(accum.sum_w)),
             .I_half = {NAN, NAN},
             .sigma_half = {NAN, NAN},
-            .d = accum.d
+            .d = accum.d,
+            .on_ice_ring = accum.on_ice_ring
         };
 
         if (accum.n_half[0] + accum.n_half[1] > 0 && accum.sum_w_half[0] > 0.0 && accum.sum_w_half[1] > 0.0) {
@@ -727,6 +731,7 @@ const char *SweepQualityReasonCode(SweepQualityReason reason) {
         case SweepQualityReason::WeakDiffraction:  return "weak_diffraction";
         case SweepQualityReason::LossOfCentring:   return "loss_of_centring";
         case SweepQualityReason::RadiationDamage:  return "radiation_damage";
+        case SweepQualityReason::InconsistentWithMerge: return "inconsistent_with_merge";
     }
     return "unknown";
 }
@@ -738,6 +743,16 @@ const char *SweepQualityReasonText(SweepQualityReason reason) {
         case SweepQualityReason::WeakDiffraction:  return "weak diffraction";
         case SweepQualityReason::LossOfCentring:   return "loss of centring";
         case SweepQualityReason::RadiationDamage:  return "radiation damage";
+        case SweepQualityReason::InconsistentWithMerge: return "inconsistent with the merge";
+    }
+    return "unknown";
+}
+
+const char *FrameDispositionCode(FrameDisposition disposition) {
+    switch (disposition) {
+        case FrameDisposition::Merged:     return "merged";
+        case FrameDisposition::Downgraded: return "downgraded";
+        case FrameDisposition::Rejected:   return "rejected";
     }
     return "unknown";
 }
diff --git a/image_analysis/scale_merge/Merge.h b/image_analysis/scale_merge/Merge.h
index c2da284bf..32144fad0 100644
--- a/image_analysis/scale_merge/Merge.h
+++ b/image_analysis/scale_merge/Merge.h
@@ -49,20 +49,33 @@ struct MergeStatisticsShell {
     double cc_anom = NAN;
 };
 
-// Why a stretch of the sweep came out much weaker than the rest of the run. Report-only: nothing is
-// excluded on the strength of it. The codes are the field's own words - "crystal rotating out of the
-// beam" (HKL-2000 manual), "loss of centring during crystal rotation" (autoPROC).
+// Why a stretch of the sweep came out much weaker than the rest of the run. The codes are the field's
+// own words - "crystal rotating out of the beam" (HKL-2000 manual), "loss of centring during crystal
+// rotation" (autoPROC). What is DONE about a range is its disposition, below; the reason only names
+// what was seen. Appended to, never renumbered: the value reaches the per-image array in the HDF5.
 enum class SweepQualityReason {
     NoDiffraction,      // the range recorded essentially no diffraction from the indexed lattice
     CrystalOutOfBeam,   // frames were lost: the range gets a per-image scale far less often than the run
     WeakDiffraction,    // the frames all still index, but with much less intensity - cause not determined
     LossOfCentring,     // one cycle of modulation per revolution: the crystal is off the rotation axis
-    RadiationDamage     // the range runs to the end of a sweep whose quality was already decaying
+    RadiationDamage,    // the range runs to the end of a sweep whose quality was already decaying
+    InconsistentWithMerge  // the frames diffract as the run does, but their intensities do not agree with it
 };
 
 const char *SweepQualityReasonCode(SweepQualityReason reason);   // machine-readable, e.g. "out_of_beam"
 const char *SweepQualityReasonText(SweepQualityReason reason);   // for a sentence, e.g. "out of beam"
 
+// What became of a frame's observations. The three codes partition the sweep - every processed image is
+// exactly one of them - so the percentages add to 100 and "5% of the frames were useless" has a meaning.
+enum class FrameDisposition {
+    Merged,      // its observations are in the merged data at their own weight
+    Downgraded,  // merged, but over a degraded stretch: carried at the reduced weight its own scale and
+                 // sigmas give it, which for weak-but-consistent data is the only honest weight there is
+    Rejected     // nothing of it reached the merge
+};
+
+const char *FrameDispositionCode(FrameDisposition disposition);   // "merged", "downgraded", "rejected"
+
 struct SweepQualityRange {
     // Inclusive, in processed-image ordinals - the numbering of <prefix>_image.dat and of every other
     // per-image array rugnux writes. With -s/--stride the source image is start + ordinal * stride.
@@ -77,6 +90,13 @@ struct SweepQualityRange {
     float mean_relative_cc = 1.0f;     // <per-image CC to merge> / run median
     float indexed_fraction = 1.0f;     // frames in the range that got a per-image scale at all
     float relative_b = NAN;            // mean of the radiation-damage monitor's per-batch B over the range
+    // What was done with the range, and what the merged data say about keeping it: delta-CC1/2 is the
+    // overall CC1/2 with the range minus the CC1/2 without it, over the reflections the range touches
+    // (negative = keeping it makes the merged intensities worse), beside the standard error of a CC1/2
+    // on that many reflections. NaN where the range carries too few reflections to be measured.
+    FrameDisposition disposition = FrameDisposition::Downgraded;
+    float delta_cc_half = NAN;
+    float delta_cc_half_se = NAN;
 };
 
 // Sweep-quality diagnostic (rotation only). `measured` separates "the run is clean" from "this did not
@@ -87,6 +107,21 @@ struct SweepQuality {
     float flux_peak_to_trough = 1.0f;        // the incident-flux proxy, over the whole run
     float modulation_peak_to_trough = 1.0f;  // depth of a DIAGNOSED once-per-revolution modulation (1 = none)
     std::vector<SweepQualityRange> ranges;
+
+    // The disposition of the whole sweep. The three counts add up to the frame count; `rejected_deg` is
+    // the same rejection in degrees, because a percentage of FRAMES can be moved by re-slicing the same
+    // experiment and a percentage of the rotation cannot.
+    int frames_merged = 0;
+    int frames_downgraded = 0;
+    int frames_rejected = 0;
+    float rejected_deg = 0.0f;
+    std::vector<uint8_t> frame_disposition;   // FrameDisposition per processed image
+
+    // The per-batch delta-CC1/2 curve the disposition was decided on, measured on the run as it stood
+    // before anything was removed (NaN where a batch carries too few reflections to be judged). Same
+    // batches as the radiation-damage monitor's relative-B curve, so the two read side by side.
+    std::vector<float> delta_cc_half_batch;
+    float delta_cc_half_batch_deg = 0.0f;
 };
 
 struct MergeStatistics {
@@ -117,7 +152,7 @@ struct MergeStatistics {
     double radiation_damage_batch_deg = 0.0;
 
     // Stretches of the sweep over which the crystal delivered much less than the rest of the run
-    // (MeasureSweepQuality). Report-only - no observation is dropped because of it.
+    // (MeasureSweepQuality), and what became of every frame of the sweep (MeasureBatchDeltaCCHalf).
     SweepQuality sweep_quality;
 
     // Diffraction anisotropy (AnalyzeAnisotropy): the anisotropy tensor, the diffraction limit along
@@ -136,6 +171,7 @@ struct MergeAccum {
     int32_t k = 0;
     int32_t l = 0;
     float d = NAN;
+    bool on_ice_ring = false;
     double sum_wI = 0.0;
     double sum_w = 0.0;
     double sum_wI_half[2] = {0.0, 0.0};
diff --git a/image_analysis/scale_merge/ResolutionCutoff.cpp b/image_analysis/scale_merge/ResolutionCutoff.cpp
index a0e241726..071a32b56 100644
--- a/image_analysis/scale_merge/ResolutionCutoff.cpp
+++ b/image_analysis/scale_merge/ResolutionCutoff.cpp
@@ -41,10 +41,23 @@ ResolutionCutoffResult ComputeCCHalfLogisticCutoff(const std::vector<MergedRefle
         return result;
     }
 
+    // Ice sits out of this fit, and only this fit. A powder ring is reproducible: past the crystal's
+    // own limit the two half-sets still agree ABOUT THE ICE, and a Pearson CC1/2 cannot tell that
+    // agreement from diffraction - shells have been measured at CC1/2 0.765 where <I/sigma> is -0.1
+    // and R_meas is 470%, and it is those shells that hold the cut open. Measured against archived
+    // references, a run with ice rings is written 12% finer than one without reaches 4%. The ring
+    // also drags the curve the other way where the data are good, dipping one shell of forty to 0.51
+    // because two ice lines cross it. Both signs are the same cause and both are removed here. The
+    // flag is the one scaling, the error model and the space-group search already keep out of their
+    // own fits; what is new is only that the resolution DECISION reads the same curve they do. The
+    // reflections are still merged, still written, still counted in the shell table.
+    //
     // s = 1/d^2 range over the merged reflections that carry a half-set pair.
     double s_lo = std::numeric_limits<double>::max(), s_hi = 0.0;
     double d_data_min = std::numeric_limits<double>::max();
     for (const auto &m : merged) {
+        if (m.on_ice_ring)
+            continue;
         if (!(m.d > 0.0f) || !std::isfinite(m.I_half[0]) || !std::isfinite(m.I_half[1]))
             continue;
         const double s = 1.0 / (static_cast<double>(m.d) * m.d);
@@ -62,6 +75,8 @@ ResolutionCutoffResult ComputeCCHalfLogisticCutoff(const std::vector<MergedRefle
     std::vector<CorrelationCoefficient> bin_cc(N_FIT_BINS);
     std::vector<int> bin_n(N_FIT_BINS, 0);
     for (const auto &m : merged) {
+        if (m.on_ice_ring)
+            continue;
         if (!(m.d > 0.0f) || !std::isfinite(m.I_half[0]) || !std::isfinite(m.I_half[1]))
             continue;
         const double s = 1.0 / (static_cast<double>(m.d) * m.d);
@@ -92,9 +107,11 @@ ResolutionCutoffResult ComputeCCHalfLogisticCutoff(const std::vector<MergedRefle
         result.note = "no low-resolution CC1/2 plateau";
         return result;
     }
+    size_t first_below = cc_bin.size();
     size_t keep = cc_bin.size();
     for (size_t i = 0; i < cc_bin.size(); ++i) {
         if (cc_bin[i] < cc_target) {
+            first_below = i;
             keep = std::min(cc_bin.size(), i + 1 + EXTEND_BINS_PAST_FALLOFF);
             break;
         }
@@ -145,7 +162,26 @@ ResolutionCutoffResult ComputeCCHalfLogisticCutoff(const std::vector<MergedRefle
     // plateau -> the fall-off crossing), NOT the full measured range: when the detector reaches far
     // past where the crystal diffracts (a high-res-configured detector on a low-res crystal), the
     // full range is dominated by high-res noise, so s_range/10 would be a huge over-extension.
-    const double s_cross = s0 + std::log(1.0 / cc_target - 1.0) / k;
+    double s_cross = s0 + std::log(1.0 / cc_target - 1.0) / k;
+
+    // The crossing has to be one the bins show, not one the logistic extrapolates to. On a real
+    // fall-off it sits between the last bin at the target and the first bin below it, with the two
+    // extension bins to spare. A crossing past the last fitted bin means the logistic never followed
+    // these data down - it settled on a shallow slope through a fall-off region that is not one -
+    // and every resolution read off it is one the bins refute. The bins' own crossing is the honest
+    // answer then: where the measured CC1/2 passes the target, between the two bins that straddle it.
+    bool logistic = true;
+    if (s_cross > s_bin.back()) {
+        if (first_below >= cc_bin.size()) {
+            result.note = "CC1/2 does not fall off within the measured range";
+            return result;
+        }
+        logistic = false;
+        const double f = (cc_bin[first_below - 1] - cc_target)
+                         / (cc_bin[first_below - 1] - cc_bin[first_below]);
+        s_cross = s_bin[first_below - 1] + f * (s_bin[first_below] - s_bin[first_below - 1]);
+    }
+
     const double delta_s = (s_cross - s_lo) / SHELLS_FOR_EXTENSION;
     const double s_final = s_cross + delta_s;
 
@@ -179,7 +215,9 @@ ResolutionCutoffResult ComputeCCHalfLogisticCutoff(const std::vector<MergedRefle
     }
 
     result.d_cut = d_cut;
-    result.note = "CC1/2 logistic fall-off, +1 shell";
+    result.note = logistic ? "CC1/2 logistic fit"
+                           : "the logistic fit extrapolates past the bins it was made over, so the "
+                             "measured CC1/2";
     return result;
 }
 
@@ -197,9 +235,9 @@ std::optional<double> ApplyResolutionCutoff(std::vector<MergedReflection> &merge
         if (rc.d_cut) {
             effective_d_min = rc.d_cut;
             if (rc.d_fit)
-                logger.Info("Auto resolution cutoff: {:.2f} A (CC1/2 fit crosses {:.2f} at {:.2f} A, "
+                logger.Info("Auto resolution cutoff: {:.2f} A ({} crosses {:.2f} at {:.2f} A, "
                             "written one shell past it; override with --scaling-high-resolution)",
-                            *rc.d_cut, cc_target, *rc.d_fit);
+                            *rc.d_cut, rc.note, cc_target, *rc.d_fit);
             else
                 logger.Info("Auto resolution cutoff: {:.2f} A ({}; override with --scaling-high-resolution)",
                             *rc.d_cut, rc.note);
diff --git a/image_analysis/scale_merge/ResolutionCutoff.h b/image_analysis/scale_merge/ResolutionCutoff.h
index 229ac21b0..b6913aea3 100644
--- a/image_analysis/scale_merge/ResolutionCutoff.h
+++ b/image_analysis/scale_merge/ResolutionCutoff.h
@@ -18,12 +18,15 @@
 // Method (see docs/rugnux_resolution_cutoff_design.md): bin CC1/2 against s = 1/d^2 in fine bins,
 // fit a logistic CC1/2(s) = 1/(1+exp(k*(s-s0))) to the contiguous-from-low-res fall-off, take the s
 // where the fit crosses cc_target, then extend by one mean (10-shell) shell width in s ("one shell
-// too far", generous). d_cut is nullopt when the fit is degenerate (too few bins, flat/non-monotone)
+// too far", generous). Where the fitted crossing lands past the bins the fit was made over - a
+// fall-off region too ragged for a logistic to follow, so the crossing is an extrapolation rather
+// than something the bins show - the crossing is read off the bins themselves instead, and
+// everything after it is unchanged. d_cut is nullopt when the fit is degenerate (too few bins, flat)
 // or CC1/2 never falls below cc_target inside the measured range - the caller then keeps the full
 // range. cc_target in (0,1); merged must carry finite I_half[0]/I_half[1] to contribute.
 struct ResolutionCutoffResult {
     std::optional<double> d_cut;   // high-resolution limit (A); nullopt => keep the full range
-    // Where the fitted CC1/2 crosses cc_target, BEFORE the deliberate one-shell extension - i.e. the
+    // Where CC1/2 crosses cc_target, BEFORE the deliberate one-shell extension - i.e. the
     // resolution the data are judged to reach, as opposed to the (coarser in s, finer in d) limit the
     // reflections are actually written to. This is the number to quote. Set whenever the fit produced
     // a crossing inside the measured range, even when no cut was applied.
diff --git a/image_analysis/scale_merge/RotationScaleMerge.cpp b/image_analysis/scale_merge/RotationScaleMerge.cpp
index f18e20aa8..d9e19e95b 100644
--- a/image_analysis/scale_merge/RotationScaleMerge.cpp
+++ b/image_analysis/scale_merge/RotationScaleMerge.cpp
@@ -69,6 +69,11 @@ namespace {
     // which keeps every frame.
     constexpr double SEARCH_MIN_SCALE_RATIO = 0.1;
 
+    // Rotation width per batch of the radiation-damage curve - and of the delta-CC1/2 ledger, which
+    // deliberately reuses it rather than choosing a granularity of its own. In degrees rather than
+    // images so that re-slicing the same experiment does not change the unit.
+    constexpr double MONITOR_BATCH_DEG = 10.0;
+
     // --- Sweep-quality diagnostic (MeasureSweepQuality) ---
     // A stretch is reported only when BOTH per-frame channels are down: the scale (how much the crystal
     // diffracted) and the CC to merge (whether what it diffracted is still usable). The CC channel is what
@@ -1492,7 +1497,6 @@ void RotationScaleMerge::MeasureRadiationDamageB(int n_groups) {
     const double osc_deg = gon ? std::fabs(gon->GetIncrement_deg()) : 0.0;
     if (!(osc_deg > 1e-6))
         return;
-    constexpr double MONITOR_BATCH_DEG = 10.0;   // rotation width per batch for the damage curve
     const int frames_per_batch = std::max(1, static_cast<int>(std::lround(MONITOR_BATCH_DEG / osc_deg)));
     const int n_batch = std::max(1, (n_frames + frames_per_batch - 1) / frames_per_batch);
     if (n_batch < 2)   // a single batch is a global Wilson-B (degenerate with scale) - nothing to monitor
@@ -1737,7 +1741,10 @@ void RotationScaleMerge::MeasureSweepQuality(const std::vector<uint8_t> &partial
     // Without a per-frame CC the protection against reporting a merely attenuated stretch is gone, so
     // leave that channel at 1 and report nothing rather than report it on the scale alone.
     const bool have_cc = cc_typ > 0.0;
-    std::vector<double> scale(n_frames, 0.0), quality(n_frames, have_cc ? 0.0 : 1.0);
+    // Members, not locals: the disposition ledger re-reads them once delta-CC1/2 has split the ranges.
+    std::vector<double> &scale = sweep_scale, &quality = sweep_cc;
+    scale.assign(n_frames, 0.0);
+    quality.assign(n_frames, have_cc ? 0.0 : 1.0);
     for (int f = 0; f < n_frames; ++f) {
         if (partial_scaled[f] && std::isfinite(g_partial[f]) && g_partial[f] > 0.0)
             scale[f] = g_partial[f] / g_typ;
@@ -1850,10 +1857,19 @@ void RotationScaleMerge::MeasureSweepQuality(const std::vector<uint8_t> &partial
     std::sort(sweep_quality.ranges.begin(), sweep_quality.ranges.end(),
               [](const SweepQualityRange &a, const SweepQualityRange &b) { return a.first_image < b.first_image; });
 
-    // Fill in each range's numbers, and say what it is. The order is from the most specific evidence to
-    // the least: nothing recorded at all; then a decay that had already set in before the range and runs
-    // to the end of the sweep; then the once-per-revolution modulation; then whether frames were lost or
-    // only intensity. What is left is a loss of diffracting power whose cause these data do not fix.
+    FillSweepRanges(/*assign_reasons=*/true);
+}
+
+// Fill in each range's numbers, and (on the first pass) say what it is. The order is from the most
+// specific evidence to the least: nothing recorded at all; then a decay that had already set in before
+// the range and runs to the end of the sweep; then the once-per-revolution modulation; then whether
+// frames were lost or only intensity. What is left is a loss of diffracting power whose cause these
+// data do not fix.
+void RotationScaleMerge::FillSweepRanges(bool assign_reasons) {
+    const std::vector<double> &scale = sweep_scale, &quality = sweep_cc;
+    const auto gon = x.GetGoniometer();
+    const double osc_deg = gon ? std::fabs(gon->GetIncrement_deg()) : 0.0;
+    const int min_len = std::max(1, static_cast<int>(std::lround(SWEEP_MIN_RANGE_DEG / osc_deg)));
     double run_scaled = 0.0;
     for (int f = 0; f < n_frames; ++f) run_scaled += scale[f] > 0.0 ? 1.0 : 0.0;
     run_scaled /= n_frames;
@@ -1877,7 +1893,7 @@ void RotationScaleMerge::MeasureSweepQuality(const std::vector<uint8_t> &partial
         r.indexed_fraction = static_cast<float>(n_ok / n_in);
         r.severity = static_cast<float>(std::clamp(1.0 - sum_s / n_in, 0.0, 1.0));
         r.relative_b = n_b > 0 ? static_cast<float>(sum_b / n_b) : NAN;
-        if (r.reason == SweepQualityReason::LossOfCentring)
+        if (!assign_reasons || r.reason == SweepQualityReason::LossOfCentring)
             continue;
         // Radiation damage is progressive: the per-frame CC has to have been falling BEFORE the range,
         // and the range has to run to the end of the sweep. A crystal that simply leaves the beam at the
@@ -1901,6 +1917,483 @@ void RotationScaleMerge::MeasureSweepQuality(const std::vector<uint8_t> &partial
     }
 }
 
+namespace {
+    // --- delta-CC1/2 (MeasureBatchDeltaCCHalf) ---
+    constexpr double DELTA_CC_SIGMA = 3.0;            // how far below the run's own batches, and below zero
+    constexpr double DELTA_CC_MAX_REJECTED = 0.25;    // ... and never more than this fraction of the sweep
+    constexpr int    DELTA_CC_MIN_REFLECTIONS = 50;   // fewer than this and the pair of CC1/2 means nothing
+    constexpr int    DELTA_CC_MIN_NULL_BATCHES = 8;   // fewer measured batches than this and there is no null
+
+    // Median, and the median absolute deviation scaled to a standard deviation. Both destroy the order
+    // of `v`, which no caller needs.
+    double MedianOf(std::vector<double> &v) {
+        const size_t mid = v.size() / 2;
+        std::nth_element(v.begin(), v.begin() + mid, v.end());
+        return v[mid];
+    }
+
+    // CC1/2 in the sigma-tau form (Assmann, Brehm & Diederichs (2016) J. Appl. Cryst. 49, 1021-1028):
+    // the variance of the unique reflections' mean intensities against the error variance of a half
+    // dataset's mean, accumulated one reflection at a time. No half-set split, so no random numbers -
+    // the same answer every run, and more precise than the split estimate.
+    struct SigmaTau {
+        double n = 0, sum_mean = 0, sum_mean2 = 0, sum_eps = 0;
+        void Add(double mean, double eps) {
+            n += 1; sum_mean += mean; sum_mean2 += mean * mean; sum_eps += eps;
+        }
+        [[nodiscard]] double CC() const {
+            if (n < 4) return NAN;
+            const double var_y = (sum_mean2 - sum_mean * sum_mean / n) / (n - 1);
+            const double eps = sum_eps / n;
+            return var_y + eps / 2 > 0.0 ? (var_y - eps / 2) / (var_y + eps / 2) : NAN;
+        }
+    };
+
+    // A reflection's mean intensity and the error variance of a half dataset's mean of it, from the
+    // OBSERVED scatter of its own observations. Observed, and not the error model's sigmas, on purpose:
+    // a batch of garbage claims the same sigmas as a good one, so an error-model estimate would read a
+    // batch that adds noise as a batch that adds precision, and the sign of the test would invert.
+    void ReflectionMoments(int n, double s1, double s2, double &mean, double &eps) {
+        mean = s1 / n;
+        eps = 2.0 * std::max(0.0, (s2 - s1 * s1 / n) / (n - 1)) / n;
+    }
+}
+
+// The frames one rocking event spans, as the combine cuts them - the same raw-hkl runs, in the same
+// image order, bridged by the same max_frame_gap - taken as the median over the run's events. It is
+// the finest stretch of the sweep this file is allowed to speak about: the partials of one event are
+// welded into a single full, so two frames closer together than this are not separable observations.
+int RotationScaleMerge::RockingEventFrames() const {
+    std::vector<int> hist(n_frames + 2, 0);
+    std::vector<float> im;
+    int n_event = 0;
+    for (size_t r = 0; r < rawrun_start.size(); ++r) {
+        const int lo = rawrun_start[r], hi = lo + rawrun_count[r];
+        im.clear();
+        for (int p = lo; p < hi; ++p) {
+            const Obs &o = partials[perm[p]];
+            if (std::isfinite(o.corr) && o.corr > 0.0f && std::isfinite(o.I)
+                && std::isfinite(o.sigma) && o.sigma > 0.0f)
+                im.push_back(o.image_number);
+        }
+        for (size_t i = 0; i < im.size();) {
+            size_t k = i + 1;
+            float last = im[i];
+            while (k < im.size() && im[k] - last <= max_frame_gap) { last = im[k]; ++k; }
+            const int span = static_cast<int>(std::lround(last) - std::lround(im[i])) + 1;
+            ++hist[std::min(span, n_frames + 1)];
+            ++n_event;
+            i = k;
+        }
+    }
+    int acc = 0;
+    for (int w = 1; w <= n_frames + 1; ++w)
+        if ((acc += hist[w]) * 2 >= n_event)
+            return w;
+    return 1;
+}
+
+// What keeping each batch of the sweep costs the merged intensities, and the frames that cost too much.
+//
+// delta-CC1/2 of a group of images is the overall CC1/2 with the group minus the CC1/2 without it,
+// evaluated over the reflections the group touches (Assmann, Brehm & Diederichs (2016) J. Appl. Cryst.
+// 49, 1021-1028; Assmann, Wang & Diederichs (2020) Acta Cryst. D76, 636-652 - XDSCC12). Negative means
+// keeping the group makes the merged data worse. It is the only instrument here that measures harm to
+// the quantity the run actually ships, which is why it, and nothing else, decides exclusions: the
+// channels that DETECT and NAME a bad stretch (the per-image scale, the per-image CC, the
+// once-per-revolution harmonic, the relative-B curve) cannot say whether removing it pays. What a
+// rejected range MEANS is never in this number; docs/RUGNUX_REPORT.md says what it cannot do.
+//
+// It runs LAST, on the corrected fulls, so it tests data the per-frame scale, the decay slope and the
+// per-batch relative-B have already downgraded - a trend the model has removed must not be rejected a
+// second time as if it were still there.
+//
+// Three properties of the statistic set the rest of the design, and all three are the authors':
+//  * its standard error goes as 1/sqrt(n_refl), so a single 0.1 deg frame is a plot and not a verdict.
+//    The decision is therefore taken at the batch the scaling model already forms (MONITOR_BATCH_DEG),
+//    and at the batch doubled, and doubled again - a defect much longer than a batch is invisible one
+//    batch at a time. Only WHERE the harm lies is settled finely, by sliding the range's edges with the
+//    whole stretch re-measured at each position, never by shrinking the interval under test.
+//  * it is an influence, not a weight: there is no principled map from a delta-CC1/2 to a
+//    per-observation variance, and inventing one would double-count with the sigmas. So it can only
+//    cut, and it is softened by ordering (above), by significance and by small steps.
+//  * never remove a group whose delta-CC1/2 is positive or near zero - "these may just be weak, and
+//    rejection without good reason may ultimately reduce the completeness". Removing one range per
+//    cycle and re-forming the reference in between is the authors' loop.
+void RotationScaleMerge::MeasureBatchDeltaCCHalf(int n_groups) {
+    frame_rejected.assign(n_frames, 0);
+    sweep_quality.delta_cc_half_batch.clear();
+    sweep_quality.delta_cc_half_batch_deg = 0.0f;
+    const auto gon = x.GetGoniometer();
+    const double osc_deg = gon ? std::fabs(gon->GetIncrement_deg()) : 0.0;
+    const int n_full = static_cast<int>(fulls.size());
+    if (!(osc_deg > 1e-6) || n_full == 0 || n_groups <= 0)
+        return;
+    const int per_batch = std::max(1, static_cast<int>(std::lround(MONITOR_BATCH_DEG / osc_deg)));
+    const int n_batch = (n_frames + per_batch - 1) / per_batch;
+    if (n_batch < 3)   // with one or two batches "the rest of the run" is not a reference
+        return;
+
+    // The observations, once: scaled intensity, ASU group (-1 = not in this merge, the same test the
+    // merge itself applies), and the frame order that makes any frame range a contiguous span.
+    std::vector<double> obs_I(n_full);
+    std::vector<int32_t> obs_group(n_full), order(n_full), fstart(n_frames + 1, 0);
+    for (int i = 0; i < n_full; ++i) {
+        const Obs &o = fulls[i];
+        obs_I[i] = o.I * o.corr;
+        obs_group[i] = UsableFull(o) ? o.group : -1;
+        ++fstart[o.frame + 1];
+    }
+    for (int f = 0; f < n_frames; ++f) fstart[f + 1] += fstart[f];
+    {
+        std::vector<int32_t> fill(fstart.begin(), fstart.end() - 1);
+        for (int i = 0; i < n_full; ++i) order[fill[fulls[i].frame]++] = i;
+    }
+
+    // Per-reflection totals over the frames still in, and the per-reflection contribution of one frame
+    // range - which is all a leave-one-out needs, because a count, a sum and a sum of squares subtract.
+    std::vector<int32_t> tot_n(n_groups, 0), d_n(n_groups, 0), touched;
+    std::vector<double> tot_s1(n_groups, 0.0), tot_s2(n_groups, 0.0),
+                        d_s1(n_groups, 0.0), d_s2(n_groups, 0.0);
+    auto build_totals = [&]() {
+        std::fill(tot_n.begin(), tot_n.end(), 0);
+        std::fill(tot_s1.begin(), tot_s1.end(), 0.0);
+        std::fill(tot_s2.begin(), tot_s2.end(), 0.0);
+        for (int i = 0; i < n_full; ++i) {
+            const int g = obs_group[i];
+            if (g < 0 || frame_rejected[fulls[i].frame]) continue;
+            tot_n[g] += 1; tot_s1[g] += obs_I[i]; tot_s2[g] += obs_I[i] * obs_I[i];
+        }
+    };
+
+    // delta-CC1/2 of the frames [f0, f1]. delta_cc is the difference in CC units, which is what a user
+    // reads; delta_z is the same difference after the Fisher transformation (eq. 6), which is what the
+    // decision is taken on - so that one standard error means the same thing at CC 0.01 and at 0.99.
+    // se_z is the standard error of a SINGLE CC1/2 on that many reflections, and `se` is that same
+    // standard error carried back into CC units so the reported pair share a unit. Single, not of the
+    // difference: the two CC1/2 share most of their data and their difference is the more precise of
+    // the two, so the test errs toward refusing to decide - which at low multiplicity is what is wanted.
+    double delta_cc = 0.0, delta_z = 0.0, se = 0.0, se_z = 0.0;
+    auto measure = [&](int f0, int f1) {
+        touched.clear();
+        for (int f = f0; f <= f1; ++f) {
+            if (frame_rejected[f]) continue;
+            for (int j = fstart[f]; j < fstart[f + 1]; ++j) {
+                const int i = order[j], g = obs_group[i];
+                if (g < 0) continue;
+                if (d_n[g] == 0) touched.push_back(g);
+                d_n[g] += 1; d_s1[g] += obs_I[i]; d_s2[g] += obs_I[i] * obs_I[i];
+            }
+        }
+        // Only reflections that are still measurable WITHOUT the range count, which is eq. 5's own
+        // restriction and carries the completeness guard with it: a range holding the only observations
+        // of the reflections it touches contributes to neither CC1/2, reads ~0, and is never rejected.
+        SigmaTau with, without;
+        for (int g : touched) {
+            const int n_without = tot_n[g] - d_n[g];
+            if (tot_n[g] >= 2 && n_without >= 2) {
+                double mean, eps;
+                ReflectionMoments(tot_n[g], tot_s1[g], tot_s2[g], mean, eps);
+                with.Add(mean, eps);
+                ReflectionMoments(n_without, tot_s1[g] - d_s1[g], tot_s2[g] - d_s2[g], mean, eps);
+                without.Add(mean, eps);
+            }
+            d_n[g] = 0; d_s1[g] = 0.0; d_s2[g] = 0.0;
+        }
+        const double cc_with = with.CC(), cc_without = without.CC();
+        if (with.n < DELTA_CC_MIN_REFLECTIONS || !std::isfinite(cc_with) || !std::isfinite(cc_without))
+            return false;
+        auto fisher = [](double cc) { return std::atanh(std::clamp(cc, -0.999999, 0.999999)); };
+        delta_cc = cc_with - cc_without;
+        delta_z = fisher(cc_with) - fisher(cc_without);
+        se_z = 1.0 / std::sqrt(with.n - 3);
+        se = (1.0 - cc_with * cc_with) * se_z;
+        return true;
+    };
+    auto convicted = [&](int f0, int f1) { return measure(f0, f1) && delta_z < -DELTA_CC_SIGMA * se_z; };
+    auto batch_first = [&](int b) { return b * per_batch; };
+    auto batch_last = [&](int b) { return std::min(n_frames, (b + 1) * per_batch) - 1; };
+
+    // The curve as the run stands, before anything is removed. This is the quantification the report
+    // carries whether or not a single frame is convicted.
+    build_totals();
+    sweep_quality.delta_cc_half_batch.assign(n_batch, NAN);
+    sweep_quality.delta_cc_half_batch_deg = static_cast<float>(MONITOR_BATCH_DEG);
+    for (int b = 0; b < n_batch; ++b)
+        if (measure(batch_first(b), batch_last(b)))
+            sweep_quality.delta_cc_half_batch[b] = static_cast<float>(delta_cc);
+
+    // The null the conviction is judged against: this run's OWN batches, measured once on the curve
+    // above and then held fixed.
+    //
+    // The standard error alone cannot decide this. A healthy crystal merges at CC1/2 ~ 0.999, where the
+    // Fisher transform turns a harm of 0.001 in CC into several standard errors, and a 10 deg batch
+    // carries enough reflections to resolve harm far below anything a user would call harm - so on a
+    // clean sweep the significance test alone convicts single frames whose removal moves nothing, which
+    // is the authors' "do not remove groups near zero". A batch therefore has to be unlike the REST OF
+    // THIS RUN - DELTA_CC_SIGMA robust standard deviations below the median of the run's own per-batch
+    // values - before the standard error is even asked whether the harm is resolvable. Held fixed across
+    // the removal cycles so that removing one batch cannot make the next look worse than it was, and left
+    // at negative infinity (nothing can be convicted) when the run has too few measured batches.
+    double null_floor = -std::numeric_limits<double>::infinity();
+    {
+        std::vector<double> v;
+        for (float d : sweep_quality.delta_cc_half_batch)
+            if (std::isfinite(d)) v.push_back(d);
+        if (static_cast<int>(v.size()) >= DELTA_CC_MIN_NULL_BATCHES) {
+            const double median = MedianOf(v);
+            for (double &d : v) d = std::fabs(d - median);
+            const double mad = MedianOf(v);
+            if (mad > 0.0)
+                null_floor = median - DELTA_CC_SIGMA * 1.4826 * mad;
+        }
+    }
+
+    // Slide a convicted batch's edges onto the frames that carry the harm. The batch decides WHETHER
+    // to reject; this decides only WHERE, and it does so by MOVING each edge rather than by shrinking
+    // the interval under test - the whole stretch is re-measured at every edge position, so the
+    // reflection count, and with it the precision, stays that of the stretch. An edge moves outward
+    // while the frames it takes in make the stretch more harmful and stops where they stop, so a
+    // defect wider than a batch is found whole and is reported where it actually lies rather than at
+    // the batch grid. Coarse steps first, then finer, down to a single frame: the finest position that
+    // exists, and no step for anyone to set.
+    //
+    // A stretch is never taken below one rocking event. The partials of one event are welded into the
+    // same fulls and a full is carried by the frame of its peak partial, so inside an event there is
+    // nothing to tell the frames apart by - a verdict on a single frame is a verdict on its
+    // neighbours' data. Locating is fine; deciding is not. Nor above what may be removed at all: the
+    // edges are free to move over a surface that is very nearly flat at the outside of a long defect,
+    // and there is nothing to be gained by walking them out into a stretch the cap below would then
+    // refuse whole.
+    const int min_frames = std::max(2, RockingEventFrames());
+    const int max_rejected = static_cast<int>(DELTA_CC_MAX_REJECTED * n_frames);
+
+    // The two per-frame channels, read through the same running medians MeasureSweepQuality segments
+    // the ledger on, so that both stages call the same frames bad and a single odd frame decides
+    // nothing on its own. A frame at the run's typical scale AND at its typical agreement is a frame
+    // nothing measured here says anything is wrong with.
+    const int sweep_window = std::max(3, static_cast<int>(std::lround(SWEEP_WINDOW_DEG / osc_deg)));
+    const auto scale_median = RunningMedian(sweep_scale, sweep_window);
+    const auto cc_median = RunningMedian(sweep_cc, sweep_window);
+    auto normal_frame = [&](int f) {
+        return scale_median[f] >= SWEEP_SCALE_FRACTION && cc_median[f] >= SWEEP_CC_FRACTION;
+    };
+
+    auto locate = [&](int &f0, int &f1) {
+        double best = measure(f0, f1) ? delta_cc : 0.0;
+        for (int step = std::max(1, per_batch / 2); step >= 1; step /= 2) {
+            bool moved = true;
+            while (moved) {
+                moved = false;
+                const std::pair<int, int> moves[4] = {{f0 - step, f1}, {f0 + step, f1},
+                                                      {f0, f1 - step}, {f0, f1 + step}};
+                int b0 = f0, b1 = f1;
+                for (const auto &[t0, t1] : moves) {
+                    if (t0 < 0 || t1 >= n_frames || t1 - t0 + 1 < min_frames
+                        || t1 - t0 + 1 > max_rejected) continue;
+                    if (measure(t0, t1) && delta_cc < best) {
+                        best = delta_cc; b0 = t0; b1 = t1; moved = true;
+                    }
+                }
+                f0 = b0; f1 = b1;
+            }
+        }
+    };
+
+    // ... and the per-image channel has to agree before anything is removed. delta-CC1/2 is measured
+    // AGAINST the merge, so choosing frames by it and then reporting that the merge improved is
+    // circular: taking out whichever frames disagree most raises every agreement statistic whether or
+    // not there was anything wrong with them - measured, on a sweep where removing the frames the
+    // statistic picks improves everything while removing the same number of frames chosen by POSITION
+    // makes everything worse. So a stretch is removed only where the per-frame channels - the scale and
+    // the CC to the merge, owing nothing to this statistic - also say its frames are worse than the
+    // run's own typical frame, by the same margins MeasureSweepQuality uses to call a stretch bad.
+    // delta-CC1/2 then says whether removing it pays, and where its edges are; it is never the only
+    // evidence that something is wrong.
+    //
+    // Frame by frame, and never as an average over the stretch: an average cannot see a healthy arc
+    // lying beside a dead one. Measured, on a sweep with two dead arcs half a turn apart - 38 frames at
+    // 0.97 of the run's scale and 0.91 of its CC, averaged with the 47 at 0.11 and 0.21 beside them,
+    // read 0.52, below the margin, and the 38 came out with the rest; at matched resolution that pair
+    // took CC1/2 from 0.80 to -0.14, where removing the healthy 38 on their own left it at 0.90. So the
+    // edges are first pulled in off any frame the channels call normal, and what is left is removed
+    // only if it holds no such frame at all: a stretch that cannot be taken without healthy frames has
+    // more than one thing in it, and refusing it is the honest answer.
+    auto trim_to_defect = [&](int &f0, int &f1) {
+        while (f0 <= f1 && normal_frame(f0)) ++f0;
+        while (f1 >= f0 && normal_frame(f1)) --f1;
+    };
+    auto corroborated = [&](int f0, int f1) {
+        for (int f = f0; f <= f1; ++f)
+            if (normal_frame(f)) return false;
+        return true;
+    };
+
+    // What is offered to the verdict: the grid of batches, then the same grid at twice the width, and
+    // twice again, up to the widest stretch that may be removed at all.
+    //
+    // A batch on its own cannot see a defect much longer than itself, and it is not a matter of
+    // precision: each batch inside such a defect is judged against a reference that still holds the
+    // REST OF THE DEFECT, so the contrast is diluted by exactly the thing being looked for. Measured,
+    // on a 136.8 deg collapse - every batch across it reads between -0.001 and -0.008 against the run's
+    // own floor of -0.0148, nothing is ever proposed, while the stretch taken whole reads -0.0352 at 59
+    // standard errors. Nor can sliding the edges rescue it: there is no conviction to slide. Doubling
+    // the width until the defect fits inside one candidate is what carries that number to the verdict,
+    // and every width here is the batch's own, doubled - there is none for anyone to pick.
+    //
+    // A wider candidate is not a weaker test. Removing more of a healthy run raises the error variance
+    // of every reflection's mean without touching the signal, so a wide clean stretch reads MORE
+    // positive than a narrow one, not less; the same floor serves every width, and serves it
+    // conservatively. What a wide candidate can do is dilute a narrow defect into the healthy run
+    // around it - which is why the narrow widths stay, and why the loop takes the worst candidate of
+    // all widths rather than the widest.
+    const int max_width = std::max(1, max_rejected / per_batch);
+    std::vector<std::pair<int, int>> candidates;
+    for (int w = 1; w <= max_width; w *= 2)
+        for (int b = 0; b < n_batch; b += w)
+            candidates.emplace_back(batch_first(b), batch_last(std::min(n_batch, b + w) - 1));
+
+    // Remove the worst candidate, re-form the reference, repeat - the authors' loop, so that a
+    // candidate is always judged against the run as it now stands rather than against one that still
+    // contains the stretches already found to be bad.
+    std::vector<std::pair<double, double>> range_cost;   // (delta_cc, se) of each range as convicted
+    std::vector<std::pair<int, int>> rejected_ranges;
+    std::vector<uint8_t> spent(candidates.size(), 0);
+    int n_rejected = 0;
+    while (true) {
+        build_totals();
+        int worst = -1;
+        double worst_z = 0.0;
+        for (size_t c = 0; c < candidates.size(); ++c)
+            if (!spent[c] && convicted(candidates[c].first, candidates[c].second)
+                && delta_cc < null_floor && delta_z < worst_z) {
+                worst = static_cast<int>(c);
+                worst_z = delta_z;
+            }
+        if (worst < 0)
+            break;
+        int f0 = candidates[worst].first, f1 = candidates[worst].second;
+        locate(f0, f1);
+        trim_to_defect(f0, f1);
+        // The stretch that was convicted is not the stretch that is removed, so what is left has to
+        // carry the verdict on its own.
+        if (f1 - f0 + 1 < min_frames || !convicted(f0, f1) || !corroborated(f0, f1)) {
+            spent[worst] = 1;   // nothing here any other channel can see; look elsewhere
+            continue;
+        }
+        int n_new = 0;
+        for (int f = f0; f <= f1; ++f) n_new += frame_rejected[f] ? 0 : 1;
+        if (n_rejected + n_new > max_rejected) {
+            logger.Warning("delta-CC1/2 stopped after {} of {} frames: removing the next stretch would "
+                           "take out more than {:.0f}% of the sweep, and past that the merge is no "
+                           "longer a reference the rest of the run can be judged against",
+                           n_rejected, n_frames, 100.0 * DELTA_CC_MAX_REJECTED);
+            break;
+        }
+        if (n_new == 0)   // the stretch landed entirely inside frames already out; nothing left to do
+            break;
+        const bool measured = measure(f0, f1);
+        rejected_ranges.emplace_back(f0, f1);
+        range_cost.emplace_back(measured ? delta_cc : NAN, measured ? se : NAN);
+        for (int f = f0; f <= f1; ++f) frame_rejected[f] = 1;
+        n_rejected += n_new;
+    }
+    build_totals();
+
+    // The ledger: one range per contiguous stretch of one disposition, with what keeping it costs.
+    SplitSweepRanges();
+    FillSweepRanges(/*assign_reasons=*/false);
+    for (auto &r : sweep_quality.ranges) {
+        if (frame_rejected[r.first_image]) {
+            // A rejected range is out of the totals now, so what it cost the merge it was measured
+            // against is the honest number - taken from the conviction that removed it. Where a ledger
+            // range spans more than one conviction, report the worst of them.
+            for (size_t i = 0; i < rejected_ranges.size(); ++i)
+                if (rejected_ranges[i].first <= r.last_image && r.first_image <= rejected_ranges[i].second
+                    && (!std::isfinite(r.delta_cc_half) || range_cost[i].first < r.delta_cc_half)) {
+                    r.delta_cc_half = static_cast<float>(range_cost[i].first);
+                    r.delta_cc_half_se = static_cast<float>(range_cost[i].second);
+                }
+        } else if (measure(r.first_image, r.last_image)) {
+            r.delta_cc_half = static_cast<float>(delta_cc);
+            r.delta_cc_half_se = static_cast<float>(se);
+        }
+    }
+
+    if (n_rejected > 0)
+        logger.Info("delta-CC1/2: {} of {} frames ({:.1f} deg) removed from the merge over {} stretch(es) "
+                    "- keeping them lowered CC1/2 by more than {:.0f} standard errors",
+                    n_rejected, n_frames, n_rejected * osc_deg, rejected_ranges.size(), DELTA_CC_SIGMA);
+}
+
+// Cut every ledger range at the boundaries of the rejection, and add a range for each rejected stretch
+// no ledger range covers - those are the frames that diffract as the run does and whose intensities
+// still do not agree with it, which is a finding of its own and not a weak range. Afterwards each range
+// is wholly rejected or wholly kept, so one disposition describes it.
+void RotationScaleMerge::SplitSweepRanges() {
+    std::vector<SweepQualityRange> out;
+    std::vector<uint8_t> covered(n_frames, 0);
+    for (const auto &r : sweep_quality.ranges) {
+        int f = r.first_image;
+        while (f <= r.last_image) {
+            int last = f;
+            while (last + 1 <= r.last_image && frame_rejected[last + 1] == frame_rejected[f]) ++last;
+            SweepQualityRange piece = r;
+            piece.first_image = f;
+            piece.last_image = last;
+            out.push_back(piece);
+            f = last + 1;
+        }
+        for (int i = r.first_image; i <= r.last_image; ++i) covered[i] = 1;
+    }
+    for (int f = 0; f < n_frames; ++f) {
+        if (!frame_rejected[f] || covered[f]) continue;
+        int last = f;
+        while (last + 1 < n_frames && frame_rejected[last + 1] && !covered[last + 1]) ++last;
+        out.push_back({f, last, SweepQualityReason::InconsistentWithMerge});
+        f = last;
+    }
+    std::sort(out.begin(), out.end(),
+              [](const SweepQualityRange &a, const SweepQualityRange &b) { return a.first_image < b.first_image; });
+    sweep_quality.ranges = std::move(out);
+}
+
+// Give every frame and every range its disposition, and count the sweep. A frame is merged if its
+// observations reached the merge, rejected if none did - whether delta-CC1/2 took them out, an earlier
+// per-frame guard did, or the frame recorded nothing to take out in the first place, all three of which
+// are the same thing to a user asking how much of the experiment was useless. Of the merged frames,
+// the ones inside a degraded range are downgraded: they are in the merge, carried at the reduced
+// weight their own scale and sigmas give them, which is the only honest weight weak data can have.
+void RotationScaleMerge::CountSweepDisposition() {
+    const auto gon = x.GetGoniometer();
+    const double osc_deg = gon ? std::fabs(gon->GetIncrement_deg()) : 0.0;
+    auto &sq = sweep_quality;
+    sq.frame_disposition.assign(n_frames, static_cast<uint8_t>(FrameDisposition::Merged));
+    for (int f = 0; f < n_frames; ++f)
+        if (!frame_in_merge[f] || frame_rejected[f])
+            sq.frame_disposition[f] = static_cast<uint8_t>(FrameDisposition::Rejected);
+    for (auto &r : sq.ranges) {
+        bool all_out = true;
+        for (int f = r.first_image; f <= r.last_image; ++f)
+            if (sq.frame_disposition[f] != static_cast<uint8_t>(FrameDisposition::Rejected)) {
+                sq.frame_disposition[f] = static_cast<uint8_t>(FrameDisposition::Downgraded);
+                all_out = false;
+            }
+        // The range's own disposition follows its frames: a range nothing of which reached the merge is
+        // rejected however it got that way - delta-CC1/2 took it out, an earlier guard did, or it
+        // recorded nothing to take out.
+        r.disposition = all_out ? FrameDisposition::Rejected : FrameDisposition::Downgraded;
+    }
+    sq.frames_merged = sq.frames_downgraded = sq.frames_rejected = 0;
+    for (int f = 0; f < n_frames; ++f)
+        switch (static_cast<FrameDisposition>(sq.frame_disposition[f])) {
+            case FrameDisposition::Merged:     ++sq.frames_merged; break;
+            case FrameDisposition::Downgraded: ++sq.frames_downgraded; break;
+            case FrameDisposition::Rejected:   ++sq.frames_rejected; break;
+        }
+    sq.rejected_deg = static_cast<float>(sq.frames_rejected * osc_deg);
+}
+
 void RotationScaleMerge::RefineRelativeB(int n_groups) {
     // RefineDecay removes the AVERAGE radiation-damage falloff as a single global relative-B slope, but the
     // relative scattering power drifts NON-monotonically across a run (absorption path as the crystal
@@ -2506,6 +2999,7 @@ bool RotationScaleMerge::DropCollapsedFullScales(bool from_staging) {
     for (int f = 0; f < n_frames; ++f)
         if (std::isfinite(g_frame[f]) && g_frame[f] < g_floor) {
             worst = std::max(worst, fitted_median / g_frame[f]);
+            frame_in_merge[f] = 0;   // out of the merge, so out of the disposition ledger's denominator
             ++n_frames_dropped;
         }
     // With no frame below the floor there is nothing for the walk below to zero, and it is a pass over
@@ -2528,6 +3022,15 @@ bool RotationScaleMerge::DropCollapsedFullScales(bool from_staging) {
     return n_dropped > 0;
 }
 
+bool RotationScaleMerge::UsableFull(const Obs &o) const {
+    if (o.group < 0) return false;
+    if (!frame_cell_ok[o.frame]) return false;
+    if (!(o.corr > 0.0f) || !std::isfinite(o.corr)) return false;
+    if (o.partiality < min_partiality) return false;
+    const float I_corr = o.I * o.corr, sigma_corr = o.sigma * o.corr;
+    return std::isfinite(I_corr) && std::isfinite(sigma_corr) && sigma_corr > 0.0f;
+}
+
 void RotationScaleMerge::Combine() {
     fulls.clear();
     g_full.assign(n_frames, 1.0);
@@ -2824,15 +3327,9 @@ namespace {
 RotationScaleMerge::Result RotationScaleMerge::MergeAndStats(int n_groups, bool for_search,
                                                             bool fulls_resident, bool full_stats) {
     // A full is usable for the merge / error model if it passes AddImage's filters (with the current
-    // ice context). group >= 0 already encodes "not absent and passes AcceptReflection".
+    // ice context).
     auto usable_merge = [&](const Obs &o) {
-        if (o.group < 0) return false;
-        if (!frame_cell_ok[o.frame]) return false;
-        if (!(o.corr > 0.0f) || !std::isfinite(o.corr)) return false;
-        if (for_search && o.on_ice) return false;
-        if (o.partiality < min_partiality) return false;
-        const float I_corr = o.I * o.corr, sigma_corr = o.sigma * o.corr;
-        return std::isfinite(I_corr) && std::isfinite(sigma_corr) && sigma_corr > 0.0f;
+        return UsableFull(o) && !(for_search && o.on_ice);
     };
 
     // The em-stats / samples / merge-accumulate / R_meas reductions run on the resident, scaled fulls
@@ -3163,7 +3660,7 @@ RotationScaleMerge::Result RotationScaleMerge::MergeAndStats(int n_groups, bool
                              reject_outliers, reject_nsigma, reject_median.data(), merge_half.data(),
                              ms.swI.data(), ms.sw.data(), ms.swIh0.data(), ms.swIh1.data(),
                              ms.swh0.data(), ms.swh1.data(), ms.nh0.data(), ms.nh1.data(),
-                             ms.d.data(), ms.rej.data(), rejected_obs.data());
+                             ms.d.data(), ms.rej.data(), ms.on_ice.data(), rejected_obs.data());
             // Per-group and independent, so the unpack splits; the rejected count is an integer sum and
             // does not care in which order the chunks add theirs in.
             std::atomic<size_t> rejected_total{0};
@@ -3175,6 +3672,7 @@ RotationScaleMerge::Result RotationScaleMerge::MergeAndStats(int n_groups, bool
                     a.swh[0] = ms.swh0[g]; a.swh[1] = ms.swh1[g];
                     a.nh[0] = static_cast<size_t>(ms.nh0[g]); a.nh[1] = static_cast<size_t>(ms.nh1[g]);
                     a.d = static_cast<float>(ms.d[g]);
+                    a.on_ice = ms.on_ice[g] != 0;
                     rej += static_cast<size_t>(ms.rej[g]);
                 }
                 rejected_total += rej;
@@ -3201,6 +3699,11 @@ RotationScaleMerge::Result RotationScaleMerge::MergeAndStats(int n_groups, bool
                 const int half = merge_half[&o - fulls.data()];
                 a.swI += wI; a.sw += w;
                 a.swIh[half] += wI; a.swh[half] += w; a.nh[half]++;
+                // Any contributing observation on an ice ring marks the merged reflection (as
+                // MergeOnTheFly does on the stills path): the intensity is still merged and written,
+                // the flag only lets a consumer that must not read ring signal as crystal signal -
+                // the CC1/2 resolution-cutoff fit - leave it out.
+                if (o.on_ice) a.on_ice = true;
                 if (!std::isfinite(a.d) && std::isfinite(o.d) && o.d > 0.0f) a.d = o.d;
             }
         // ---- Export merged reflections. ----
@@ -3219,6 +3722,7 @@ RotationScaleMerge::Result RotationScaleMerge::MergeAndStats(int n_groups, bool
             mr.I_half[0] = mr.I_half[1] = NAN;
             mr.sigma_half[0] = mr.sigma_half[1] = NAN;
             mr.d = a.d;
+            mr.on_ice_ring = a.on_ice;
             if (a.nh[0] + a.nh[1] > 0 && a.swh[0] > 0.0 && a.swh[1] > 0.0) {
                 for (int i = 0; i < 2; ++i) {
                     mr.I_half[i] = static_cast<float>(a.swIh[i] / a.swh[i]);
@@ -3749,6 +4253,10 @@ RotationScaleMerge::Result RotationScaleMerge::Run(bool for_search, bool full_st
         }
     }
     const std::vector<uint8_t> partial_scaled = frame_scaled_scratch;
+    // The disposition ledger's denominator; the per-frame drops below take frames out of it.
+    frame_in_merge.assign(n_frames, 0);
+    for (int f = 0; f < n_frames; ++f)
+        frame_in_merge[f] = partial_scaled[f] && frame_cell_ok[f] ? 1 : 0;
 
     // --- 1b. Guard the per-frame partial scales. Unconditional: the smooth-G window below used to be
     //         where this lived, so --smooth-g 0, a dataset with no oscillation width, and every caller
@@ -3757,6 +4265,8 @@ RotationScaleMerge::Result RotationScaleMerge::Run(bool for_search, bool full_st
         std::vector<uint8_t> apply;
         std::vector<double> ratio;
         if (DropCollapsedScales(frame_scaled_scratch, g_partial, apply, ratio)) {
+            for (int f = 0; f < n_frames; ++f)
+                if (apply[f]) frame_in_merge[f] = 0;
             bool applied_on_gpu = false;
 #ifdef JFJOCH_USE_CUDA
             if (gpu_active_) {
@@ -3920,6 +4430,8 @@ RotationScaleMerge::Result RotationScaleMerge::Run(bool for_search, bool full_st
                 ++n_rejected;
             }
         if (n_rejected > 0) {
+            for (int f = 0; f < n_frames; ++f)
+                if (reject[f]) frame_in_merge[f] = 0;
             bool reject_on_gpu = false;
 #ifdef JFJOCH_USE_CUDA
             if (gpu_active_) {
@@ -4050,7 +4562,8 @@ RotationScaleMerge::Result RotationScaleMerge::Run(bool for_search, bool full_st
     if (refine_surfaces)
         MeasureRadiationDamageB(n_groups);
     // Sweep-quality diagnostic, on the per-frame scale the partial scaling just fitted (the flux is
-    // already out of it) and the per-frame CC computed above. Report-only; drops nothing.
+    // already out of it) and the per-frame CC computed above. It drops nothing itself; the ranges it
+    // segments are the ledger 4c below decides on.
     if (refine_surfaces)
         MeasureSweepQuality(partial_scaled, cc, cc_n);
     // CC1/2 of these same fulls with the surfaces not yet folded in, for the caller's cross-pass quality
@@ -4081,10 +4594,26 @@ RotationScaleMerge::Result RotationScaleMerge::Run(bool for_search, bool full_st
         RefineModulation(modulation_iter, n_groups);
     if (refine_surfaces && absorption_iter > 0)
         RefineAbsorptionTime(absorption_iter, n_groups);   // last: the static surfaces get first claim
+
+    // --- 4c. The disposition. What keeping each batch of the sweep costs the merged intensities
+    //         (delta-CC1/2), which frames cost too much, and what became of every frame of the run.
+    //         LAST, on the corrected fulls: a trend the corrections have already removed must not be
+    //         rejected a second time as if it were still there. Taking a frame's observations out is
+    //         zeroing their corr, the same mechanism every other filter of this pass uses. ---
+    bool rejected_frames = false;
+    if (refine_surfaces && sweep_quality.measured) {
+        MeasureBatchDeltaCCHalf(n_groups);
+        for (int f = 0; f < n_frames; ++f)
+            rejected_frames = rejected_frames || frame_rejected[f];
+        if (rejected_frames)
+            for (auto &o : fulls)
+                if (frame_rejected[o.frame]) o.corr = 0.0f;
+        CountSweepDisposition();
+    }
 #ifdef JFJOCH_USE_CUDA
     // The corrections mutate the host fulls' corr; when the merge runs on the resident (GPU) fulls, push
     // the corrected corr back to the device so the merge reads it.
-    if ((corrections || rejected_full_scales) && combined_on_gpu && scaled_fulls_on_gpu) {
+    if ((corrections || rejected_full_scales || rejected_frames) && combined_on_gpu && scaled_fulls_on_gpu) {
         std::vector<float> fcorr(fulls.size());
         ParallelChunks(static_cast<int>(fulls.size()), ThreadsForWork(fulls.size(), nthreads),
                        [&](int lo, int hi) {
diff --git a/image_analysis/scale_merge/RotationScaleMerge.h b/image_analysis/scale_merge/RotationScaleMerge.h
index 1d7879617..81d76dce6 100644
--- a/image_analysis/scale_merge/RotationScaleMerge.h
+++ b/image_analysis/scale_merge/RotationScaleMerge.h
@@ -265,14 +265,16 @@ private:
     // The merge accumulators (see MergeAndStats' run_merge): one entry per ASU group, plus the arrays
     // the device kernel fills that the host unpacks into them. Members for the same reason as
     // FullsStaging - a merge runs several times per run and this is a hundred megabytes between them.
-    struct Accum { double swI = 0, sw = 0, swIh[2] = {0, 0}, swh[2] = {0, 0}; size_t nh[2] = {0, 0}; float d = NAN; };
+    struct Accum { double swI = 0, sw = 0, swIh[2] = {0, 0}, swh[2] = {0, 0}; size_t nh[2] = {0, 0}; float d = NAN;
+                   bool on_ice = false; };
     std::vector<Accum> merge_acc;
     struct MergeAccumStaging {
         std::vector<double> swI, sw, swIh0, swIh1, swh0, swh1, d;
         std::vector<int32_t> nh0, nh1, rej;
+        std::vector<uint8_t> on_ice;
         void Resize(int n) {
             swI.resize(n); sw.resize(n); swIh0.resize(n); swIh1.resize(n); swh0.resize(n); swh1.resize(n);
-            d.resize(n); nh0.resize(n); nh1.resize(n); rej.resize(n);
+            d.resize(n); nh0.resize(n); nh1.resize(n); rej.resize(n); on_ice.resize(n);
         }
     };
     MergeAccumStaging merge_accum;
@@ -303,10 +305,25 @@ private:
     std::vector<float> rad_damage_b_batch;                                 // per-batch relative-B curve (A^2)
     double rad_damage_batch_deg = 0.0;                                     // rotation width per batch (deg)
 
-    // Sweep-quality diagnostic (MeasureSweepQuality; report-only, copied into the result statistics by
-    // MergeAndStats). Empty and not measured until it runs.
+    // Sweep-quality diagnostic (MeasureSweepQuality, then the delta-CC1/2 and the disposition;
+    // copied into the result statistics by MergeAndStats). Empty and not measured until it runs.
     SweepQuality sweep_quality;
 
+    // The two per-frame channels MeasureSweepQuality segmented, kept so the ledger can recompute a
+    // range's numbers after the ranges have been split at the rejection boundaries. Relative to the
+    // run median; 0 in both means the frame contributed nothing.
+    std::vector<double> sweep_scale, sweep_cc;
+
+    // Frames whose observations delta-CC1/2 convicted (1 = out of the merge). Sized n_frames and all
+    // zero until MeasureBatchDeltaCCHalf runs; Run() is what takes the observations out.
+    std::vector<uint8_t> frame_rejected;
+
+    // Frames whose observations reach this pass's merge at all (1 = in), before delta-CC1/2 has its say.
+    // Built by Run(), where every per-frame drop is decided. A full cannot answer this: the combine
+    // attributes a rocking event to its PEAK frame, so on fine slicing most frames own no full at all
+    // while their measurements sit inside one.
+    std::vector<uint8_t> frame_in_merge;
+
     // Working per-group arrays (sized to the current group count; reused).
     std::vector<int32_t> group_h, group_k, group_l;
 
@@ -377,6 +394,11 @@ private:
 
     void Combine();   // partials -> fulls (CPU)
 
+    // Is this full in the merge? group >= 0 already encodes "not absent and passes AcceptReflection";
+    // the rest is the frame's cell-consistency mask, a usable scale and a usable sigma. The P1 search
+    // pass adds its own ice test on top of this (see MergeAndStats).
+    [[nodiscard]] bool UsableFull(const Obs &o) const;
+
     // Drop the fulls of any frame whose scale collapsed toward zero. The fulls are scaled with the Unity
     // model, so their corr IS 1/G and a collapsed G multiplies every intensity on that frame without
     // bound. Covers the CPU and GPU scaling paths alike; `from_staging` says the fulls' frame and corr
@@ -420,11 +442,30 @@ private:
     // any decay correction and store the first->last relative-B change + the per-batch curve on this object
     // (copied into the result statistics by MergeAndStats, then printed / logged / written to the mmCIF).
     void MeasureRadiationDamageB(int n_groups);
-    // Sweep-quality diagnostic (report-only): find the contiguous stretches of the sweep over which the
-    // crystal delivered much less than the rest of the run, and say what each one looks like. Reads the
+    // Sweep-quality diagnostic: find the contiguous stretches of the sweep over which the crystal
+    // delivered much less than the rest of the run, and say what each one looks like. Reads the
     // per-frame scale (with the incident flux already divided out) and the per-frame CC to merge.
+    // It only DETECTS and NAMES; what is done about a stretch is MeasureBatchDeltaCCHalf's decision.
     void MeasureSweepQuality(const std::vector<uint8_t> &partial_scaled, const std::vector<double> &cc,
                              const std::vector<int64_t> &cc_n);
+    // Fill in every ledger range's numbers from sweep_scale / sweep_cc. assign_reasons=false keeps the
+    // reasons already on the ranges, which is what a re-fill after the ranges were split wants.
+    void FillSweepRanges(bool assign_reasons);
+    // The frames one rocking event spans, as the combine cuts them: the median over the run's events.
+    // Walked on the partials, because the combine also runs on the GPU and a full keeps only the frame
+    // of its peak partial.
+    [[nodiscard]] int RockingEventFrames() const;
+    // Per-batch delta-CC1/2 on the corrected fulls: measure what keeping each batch of the sweep costs
+    // the merged intensities, convict the batches that cost significantly, slide the conviction's edges
+    // onto the frames that carry it, and turn the result into the disposition ledger. Fills
+    // frame_rejected, which Run() then takes out of the merge. See the .cpp for the statistic and the
+    // discipline.
+    void MeasureBatchDeltaCCHalf(int n_groups);
+    // Split the ledger ranges at the boundaries of frame_rejected and add a range for every rejected
+    // stretch no ledger range covers, so that each range is wholly rejected or wholly kept.
+    void SplitSweepRanges();
+    // Give every frame and every ledger range its disposition, and count the sweep.
+    void CountSweepDisposition();
     // Per-batch relative-B, applied after RefineDecay: the single decay slope removes the average
     // radiation-damage falloff, but the relative scattering power drifts NON-monotonically across a run
     // (absorption path, crystal slippage, dose bursts). Refine one relative Debye-Waller B per batch
diff --git a/image_analysis/scale_merge/RotationScaleMergeGPU.cu b/image_analysis/scale_merge/RotationScaleMergeGPU.cu
index 814c74ae6..75be014a2 100644
--- a/image_analysis/scale_merge/RotationScaleMergeGPU.cu
+++ b/image_analysis/scale_merge/RotationScaleMergeGPU.cu
@@ -472,6 +472,7 @@ namespace {
         uint8_t *valid;
         double *a_swI, *a_sw, *a_swIh0, *a_swIh1, *a_swh0, *a_swh1, *a_d;
         int32_t *a_nh0, *a_nh1, *a_rejected;
+        uint8_t *a_on_ice;
         double *r_absdev, *r_sumI;
         int32_t *r_n, *r_nusable;
         uint8_t *rejected_obs;   // per-full: set by MergeAccum (outlier-rejected), read by MergeRmeas
@@ -544,7 +545,7 @@ namespace {
         for (int g = blockIdx.x * blockDim.x + threadIdx.x; g < p.n_groups; g += gridDim.x * blockDim.x) {
             const int lo = p.gstart[g], hi = lo + p.gcount[g];
             double swI = 0, sw = 0, swIh0 = 0, swIh1 = 0, swh0 = 0, swh1 = 0, dd = NAN;
-            int nh0 = 0, nh1 = 0, rejected = 0;
+            int nh0 = 0, nh1 = 0, rejected = 0, onice = 0;
             const float rmed = p.reject_median[g];
             for (int q = lo; q < hi; ++q) {
                 const int i = p.gperm[q];
@@ -575,11 +576,12 @@ namespace {
                 const int half = p.half[i];
                 swI += wI; sw += w;
                 if (half) { swIh1 += wI; swh1 += w; ++nh1; } else { swIh0 += wI; swh0 += w; ++nh0; }
+                if (p.on_ice[i]) onice = 1;   // see the host merge loop
                 if (!isfinite(dd) && isfinite(p.d[i]) && p.d[i] > 0.0f) dd = p.d[i];
             }
             p.a_swI[g] = swI; p.a_sw[g] = sw; p.a_swIh0[g] = swIh0; p.a_swIh1[g] = swIh1;
             p.a_swh0[g] = swh0; p.a_swh1[g] = swh1; p.a_nh0[g] = nh0; p.a_nh1[g] = nh1; p.a_d[g] = dd;
-            p.a_rejected[g] = rejected;
+            p.a_rejected[g] = rejected; p.a_on_ice[g] = uint8_t(onice);
         }
     }
 
@@ -657,6 +659,7 @@ struct RotationScaleMergeGPU::Impl {
     CudaDevicePtr<uint8_t> m_half;       // per-full CC1/2 half-set, assigned on the host
     CudaDevicePtr<double> a_swI, a_sw, a_swIh0, a_swIh1, a_swh0, a_swh1, a_d;   // merge accum per group
     CudaDevicePtr<int32_t> a_nh0, a_nh1, a_rejected;
+    CudaDevicePtr<uint8_t> a_on_ice;     // per group: any contributing full on an ice ring
     CudaDevicePtr<float> reject_median;
     CudaDevicePtr<double> merged_I, r_absdev, r_sumI;   // R_meas per group (merged_I uploaded)
     CudaDevicePtr<int32_t> r_n, r_nusable;
@@ -858,7 +861,7 @@ void RotationScaleMergeGPU::MergeAccum(double error_model_a, double error_model_
                                        const uint8_t *half,
                                        double *swI, double *sw, double *swIh0, double *swIh1,
                                        double *swh0, double *swh1, int32_t *nh0, int32_t *nh1, double *d_out,
-                                       int32_t *rejected, uint8_t *rejected_obs) {
+                                       int32_t *rejected, uint8_t *on_ice_out, uint8_t *rejected_obs) {
     DeviceGuard guard(impl_->device, impl_->available);
     auto &d = *impl_;
     const int ng = d.n_groups;
@@ -867,6 +870,7 @@ void RotationScaleMergeGPU::MergeAccum(double error_model_a, double error_model_
     d.a_swh0 = CudaDevicePtr<double>(std::max(1, ng)); d.a_swh1 = CudaDevicePtr<double>(std::max(1, ng));
     d.a_nh0 = CudaDevicePtr<int32_t>(std::max(1, ng)); d.a_nh1 = CudaDevicePtr<int32_t>(std::max(1, ng));
     d.a_d = CudaDevicePtr<double>(std::max(1, ng)); d.a_rejected = CudaDevicePtr<int32_t>(std::max(1, ng));
+    d.a_on_ice = CudaDevicePtr<uint8_t>(std::max(1, ng));
     d.m_rejected = CudaDevicePtr<uint8_t>(std::max(1, d.n_fulls));
     CudaCheck(cudaMemset(d.m_rejected.get(), 0, size_t(std::max(1, d.n_fulls)) * sizeof(uint8_t)),
               "zero m_rejected");
@@ -889,7 +893,7 @@ void RotationScaleMergeGPU::MergeAccum(double error_model_a, double error_model_
     p.em_mean = d.m_em_mean.get();
     p.a_swI = d.a_swI.get(); p.a_sw = d.a_sw.get(); p.a_swIh0 = d.a_swIh0.get(); p.a_swIh1 = d.a_swIh1.get();
     p.a_swh0 = d.a_swh0.get(); p.a_swh1 = d.a_swh1.get(); p.a_nh0 = d.a_nh0.get(); p.a_nh1 = d.a_nh1.get();
-    p.a_d = d.a_d.get(); p.a_rejected = d.a_rejected.get();
+    p.a_d = d.a_d.get(); p.a_rejected = d.a_rejected.get(); p.a_on_ice = d.a_on_ice.get();
     p.rejected_obs = d.m_rejected.get();
 
     const int grp_blocks = std::min(65535, (ng + BLK - 1) / BLK);
@@ -903,6 +907,7 @@ void RotationScaleMergeGPU::MergeAccum(double error_model_a, double error_model_
     CudaCheck(cudaMemcpy(nh0, d.a_nh0.get(), size_t(ng) * sizeof(int32_t), cudaMemcpyDeviceToHost), "dl nh0");
     CudaCheck(cudaMemcpy(nh1, d.a_nh1.get(), size_t(ng) * sizeof(int32_t), cudaMemcpyDeviceToHost), "dl nh1");
     CudaCheck(cudaMemcpy(rejected, d.a_rejected.get(), size_t(ng) * sizeof(int32_t), cudaMemcpyDeviceToHost), "dl rej");
+    CudaCheck(cudaMemcpy(on_ice_out, d.a_on_ice.get(), size_t(ng) * sizeof(uint8_t), cudaMemcpyDeviceToHost), "dl on_ice");
     CudaCheck(cudaMemcpy(rejected_obs, d.m_rejected.get(), size_t(d.n_fulls) * sizeof(uint8_t), cudaMemcpyDeviceToHost),
               "dl rejected_obs");
 }
diff --git a/image_analysis/scale_merge/RotationScaleMergeGPU.h b/image_analysis/scale_merge/RotationScaleMergeGPU.h
index fa32e89a9..c3c4c586e 100644
--- a/image_analysis/scale_merge/RotationScaleMergeGPU.h
+++ b/image_analysis/scale_merge/RotationScaleMergeGPU.h
@@ -89,7 +89,7 @@ public:
                     const uint8_t *half,
                     double *swI, double *sw, double *swIh0, double *swIh1,
                     double *swh0, double *swh1, int32_t *nh0, int32_t *nh1, double *d_out,
-                    int32_t *rejected, uint8_t *rejected_obs);
+                    int32_t *rejected, uint8_t *on_ice_out, uint8_t *rejected_obs);
 
     // Per-group R_meas accumulators (sum|I_corr-merged_I|, sum_I, n, and the count this looser walk
     // accepted - which the host uses only to skip empty groups, NOT as the per-shell
diff --git a/image_analysis/scale_merge/SearchSpaceGroup.cpp b/image_analysis/scale_merge/SearchSpaceGroup.cpp
index df61f5ab4..a54a4603e 100644
--- a/image_analysis/scale_merge/SearchSpaceGroup.cpp
+++ b/image_analysis/scale_merge/SearchSpaceGroup.cpp
@@ -498,6 +498,34 @@ RowModulation FindRowModulation(const gemmi::UnitCell& cell, const std::array<in
         return out;
     }
 
+    // The group a set of rotations GENERATES: close the set under composition. Empty when the closure
+    // is not a crystallographic point group, which has at most 24 proper rotations. That is not a
+    // guard against nothing: where the caller gives no lattice system, candidates are enumerated in
+    // every setting at once, so the confirmed set can hold a four-fold and a six-fold about the same
+    // axis. Their product is an integer matrix of infinite order and the closure never terminates -
+    // and a set with no finite group behind it has no point group to propose either way.
+    // Sorted, so the result compares directly against a candidate's rotation set.
+    constexpr size_t MAX_PROPER_ROTATIONS = 24;   // 432, the largest crystallographic rotation group
+
+    std::vector<std::array<int, 9>> GeneratedRotationSet(const std::vector<gemmi::Op>& generators) {
+        std::vector<gemmi::Op> group{gemmi::Op::identity()};
+        for (size_t i = 0; i < group.size(); ++i)
+            for (const gemmi::Op& g : generators) {
+                gemmi::Op p = group[i] * g;
+                p.tran = {0, 0, 0};
+                if (std::none_of(group.begin(), group.end(),
+                                 [&](const gemmi::Op& q) { return q.rot == p.rot; }))
+                    group.push_back(p);
+                if (group.size() > MAX_PROPER_ROTATIONS)
+                    return {};
+            }
+        std::vector<std::array<int, 9>> out;
+        for (const gemmi::Op& op : group)
+            out.push_back(RotKey(op));
+        std::sort(out.begin(), out.end());
+        return out;
+    }
+
     // Whether a CELL can host a group's rotations. A setting is a statement about DIRECTION -
     // P 1 1 2 puts the 2-fold on c and needs alpha = beta = 90, where P 1 2 1 puts it on b and needs
     // alpha = gamma = 90 - so a candidate offered in a setting the metric does not have would be
@@ -1264,9 +1292,13 @@ SearchSpaceGroupResult SearchSpaceGroup(
                     // three already and drops them on the floor; the ledger is that table kept.
                     double parent_b_used = -1.0;
                     bool eligible = false;
+                    // Offered by the closure below rather than confirmed operator by operator. Like a
+                    // widened rung it may be ADOPTED but must not JUDGE - see the two sites that read it.
+                    bool closure = false;
                     std::string why; };
     int refused_order = 0;
     std::string refused_pg_hm, refused_why;
+    const gemmi::SpaceGroup *refused_pg_rep = nullptr;
     std::vector<PGCand> pg_cands;
     double chi2_ref = std::numeric_limits<double>::infinity();
     // Which point groups their own operators confirm. Serial: the operators were all scored in
@@ -1280,6 +1312,54 @@ SearchSpaceGroupResult SearchSpaceGroup(
         confirmed.push_back(&pg);
         confirmed_cc.push_back(min_class_cc);
     }
+    // CLOSURE. The loop above admits a point group only when EVERY one of its operators clears the
+    // bar, so admission is a conjunction over an enumerated list: one operator reading low deletes the
+    // whole group, and the operators that DID clear the bar can then generate a group no admitted
+    // candidate names. That is a self-contradiction in the operator table, not a low symmetry - a set
+    // of five confirmed two-folds whose products include a refused four-fold cannot be a subgroup of
+    // anything, and what it generates is the higher group. It happens whenever the merge the operators
+    // were scored on cannot connect the parts of reciprocal space one operator compares while another
+    // stays inside a well-connected part: the disconnected operator reads as broken and the group is
+    // lost, though the rest of the table already implies it.
+    //
+    // So the generated group is offered as a candidate too. It is PROPOSED, not adopted: it goes
+    // through the same chi^2, systematic-b, H and added-operator-R tests as every other candidate,
+    // and like a widened rung it does not set chi2_ref and is not a parent, so offering it cannot
+    // make any other promotion harder than it was.
+    //
+    // EXACTLY the generated group, never a supergroup of it. Offering the smallest candidate that
+    // CONTAINS the generated set - to reach a rotation set the basis cannot name, such as a diagonal
+    // orthorhombic one in a tetragonal metric - was tried and is an over-call: a crystal whose one
+    // confirmed operator reads 0.889 while the other two read 0.05 then has 222 proposed on its
+    // behalf, and where only one operator is confirmed the added-operator R is judged against the
+    // loose first-step-out-of-P1 bound, which it cleared by 3%. That hole is real but it is an
+    // enumeration hole, and it has to be closed by NAMING the group in a basis that carries it, not
+    // by promoting past the evidence.
+    std::vector<char> confirmed_closure(confirmed.size(), 0);
+    {
+        std::vector<gemmi::Op> generators;
+        for (const auto& pg : point_groups)
+            for (const auto& rot : pg.rotations)
+                if (operator_score(rot).present
+                    && std::none_of(generators.begin(), generators.end(),
+                                    [&](const gemmi::Op& g) { return g.rot == rot.rot; }))
+                    generators.push_back(rot);
+        const auto generated = GeneratedRotationSet(generators);
+        if (!generated.empty()) {
+            const PointGroupInfo* proposal = nullptr;
+            for (const auto& pg : point_groups)
+                if (pg.rotation_set == generated)
+                    proposal = &pg;
+            if (proposal != nullptr
+                && std::find(confirmed.begin(), confirmed.end(), proposal) == confirmed.end()) {
+                confirmed.push_back(proposal);
+                confirmed_cc.push_back(point_group_present(proposal->rotations).second);
+                confirmed_closure.push_back(1);
+                if (proposal->representative)
+                    result.generated_point_group_hm = proposal->representative->point_group_hm();
+            }
+        }
+    }
     // Merging under a candidate costs three passes over the whole merge, and there are a handful of
     // candidates, each reading nothing but the shared reflection arrays - so give each one a thread.
     // Every candidate's sums are still formed on one thread, over the same reflections in the same
@@ -1298,12 +1378,15 @@ SearchSpaceGroupResult SearchSpaceGroup(
         const PointGroupInfo& pg = *confirmed[i];
         pg_cands.push_back({&pg, static_cast<int>(pg.rotations.size()) + 1, confirmed_cc[i],
                             cand_chi2[i], cand_b[i]});
-        // A rung the widened enumeration added does not set the reference chi^2. Otherwise adding it
+        pg_cands.back().closure = confirmed_closure[i] != 0;
+        // A rung the widened enumeration added does not set the reference chi^2, and neither does the
+        // closure proposal. Otherwise adding it
         // would make every HIGHER promotion harder to reach - chi2_ref is a minimum - and the search
         // could answer LOWER because a candidate was offered, which is the opposite of what offering
         // it is for. Measured before this line existed: an F-cubic crystal's 432 and an orthorhombic
         // crystal's 222 were both refused once the a- and c-unique 2-folds joined the list.
-        if (!pg.rotations.empty() && std::isfinite(cand_chi2[i]) && !pg.widened)
+        if (!pg.rotations.empty() && std::isfinite(cand_chi2[i]) && !pg.widened
+            && !confirmed_closure[i])
             chi2_ref = std::min(chi2_ref, cand_chi2[i]);
     }
 
@@ -1360,11 +1443,11 @@ SearchSpaceGroupResult SearchSpaceGroup(
         if (!c.pg->rotations.empty()) {
             int parent_order = 0;
             for (const auto& s : pg_cands)
-                // Same reason as chi2_ref above: a rung only the widened enumeration offers is not a
-                // parent. The promotion answers to the most damning of its parents, so admitting two
-                // more order-2 subgroups of 222 makes the 222 step strictly harder than it was before
-                // the rung was offered at all.
-                if (!s.pg->widened && s.order < c.order && s.order >= parent_order
+                // Same reason as chi2_ref above: a rung only the widened enumeration offers, and the
+                // closure proposal, are not parents. The promotion answers to the most damning of its
+                // parents, so admitting two more order-2 subgroups of 222 makes the 222 step strictly
+                // harder than it was before the rung was offered at all.
+                if (!s.pg->widened && !s.closure && s.order < c.order && s.order >= parent_order
                     && std::includes(c.pg->rotation_set.begin(), c.pg->rotation_set.end(),
                                      s.pg->rotation_set.begin(), s.pg->rotation_set.end())) {
                     if (s.order > parent_order) {
@@ -1454,25 +1537,6 @@ SearchSpaceGroupResult SearchSpaceGroup(
             && (miscalibrated || (std::isfinite(c.chi2) && std::isfinite(chi2_ref)
                                   && c.chi2 <= chi2_ref * opt.max_merge_chi2_rescue)))
             consistent = true;
-        // Veto a chi^2-passing promotion whose b clearly ballooned (above the largest genuine step, below a
-        // twin); a genuine but imperfectly-scaled high-symmetry merge stays under the bound and is untouched.
-        // The parent b is floored (min_systematic_b_for_veto) so a near-zero parent on excellent data cannot
-        // fabricate a huge ratio out of a still-tiny absolute b (a genuine 422 at b=0.05 over a 222 parent at
-        // b=0.008 is not a twin - a real twin drives b to ~0.19 regardless).
-        //
-        // The veto also answers to the H test: it does not fire on a promotion H has CONFIRMED. The two
-        // can disagree because they measure different things - b is fitted against the merged sigmas, so
-        // it moves with the measurement, while H compares intensities with intensities - and where they
-        // do, H is the one that was measured to separate a twin from a real symmetry (see
-        // max_operator_h_ratio and max_systematic_b_veto). A twin fails both.
-        const bool h_confirmed = std::isfinite(h_ratio) && h_ratio <= opt.max_operator_h_ratio;
-        bool b_refused = false;
-        if (consistent && !h_confirmed && parent_b > 1e-4
-            && c.b_extra > std::max(parent_b, opt.min_systematic_b_for_veto) * opt.max_systematic_b_veto) {
-            consistent = false;
-            b_refused = true;
-        }
-
         // The H test is a necessary condition for promotion where it can be computed: it is the only
         // statistic measured to separate genuine symmetry from a merohedral twin across data amounts.
         const bool h_refused = std::isfinite(h_ratio) && h_ratio > opt.max_operator_h_ratio;
@@ -1509,12 +1573,12 @@ SearchSpaceGroupResult SearchSpaceGroup(
         if (!consistent) {
             // Same three sentences the highest refusal gets below, but kept per candidate for the
             // ledger: short, because the long form is written once for the group the user is told about.
-            c.why = h_refused ? "H ratio" : r_refused ? "added-operator R" : b_refused ? "systematic b"
-                                                                                       : "merge chi^2";
+            c.why = h_refused ? "H ratio" : r_refused ? "added-operator R" : "merge chi^2";
             // Record the highest-order refusal so the caller can say WHY it is processing lower.
             if (c.order > refused_order && c.pg->representative) {
                 refused_order = c.order;
                 refused_pg_hm = c.pg->representative->point_group_hm();
+                refused_pg_rep = c.pg->representative;
                 if (h_refused)
                     // Twinning by a fraction a scales every twin-related difference by (1-2a), and
                     // |I1-I2|/(I1+I2) is uniform on [0,1] for untwinned Wilson intensities, so the
@@ -1536,14 +1600,6 @@ SearchSpaceGroupResult SearchSpaceGroup(
                                          + FormatDouble(opt.max_operator_r_over_floor, 1))
                                 + "x) - at full resolution the added operator relates reflections that "
                                   "disagree far beyond measurement error, i.e. it is not a real symmetry";
-                else if (b_refused)
-                    // Against the FLOORED parent b, which is what the test compared - quoting the raw
-                    // parent b reads as a far bigger balloon than the one that actually tripped the veto.
-                    refused_why = "its merge's systematic error b is " + FormatDouble(c.b_extra, 3)
-                                + " against the subgroup's "
-                                + FormatDouble(std::max(parent_b, opt.min_systematic_b_for_veto), 3)
-                                + " (bound " + FormatDouble(opt.max_systematic_b_veto, 2)
-                                + "x) - the added operator forces unequal intensities together";
                 else if (std::isfinite(c.chi2) && std::isfinite(chi2_ref))
                     refused_why = "merge chi^2 is " + FormatDouble(c.chi2 / chi2_ref, 2)
                                 + "x the subgroup's (bound " + FormatDouble(opt.max_merge_chi2_ratio, 2) + ")";
@@ -1594,6 +1650,7 @@ SearchSpaceGroupResult SearchSpaceGroup(
                                     : std::numeric_limits<double>::quiet_NaN();
     for (const auto& c : pg_cands)
         if (c.pg == best_pg) {
+            result.generated_point_group_adopted = c.closure;
             result.h_ratio = c.h_ratio;
             result.r_added = c.r_added;
             result.r_over_floor = c.r_over_floor;
@@ -1638,6 +1695,7 @@ SearchSpaceGroupResult SearchSpaceGroup(
     if (refused_order > best_pg_order) {
         result.refused_point_group_hm = refused_pg_hm;
         result.refused_reason = refused_why;
+        result.refused_point_group_representative = *refused_pg_rep;
     }
 
     // --- Stage B: pick the space group within the point group ---
@@ -1921,13 +1979,19 @@ SearchSpaceGroupResult SearchSpaceGroup(
         //    row accumulates past any fixed bar (42 absences at a fifth of their row sum to 28
         //    nats), while the rate is bounded. Measured on the deferrals that were right against
         //    the two that were wrong: 1.4-1.8 nats per reflection against 0.4-0.7.
-        //  - it is NOT judged against a measured pseudo-translation. On such a row the corrected
-        //    evidence is a residue, not a measurement: the cone under-states the on-row depth
-        //    whenever the translation's perpendicular components sit off half-integer (a cone
-        //    member's phase is spread, the on-row phase is exactly pi) - measured at 4-7x in every
-        //    shell on the crystal the correction was built for - and a residue can pass any bar the
-        //    real modulation is deep enough to fund. The corrected COUNT is the one instrument the
-        //    modulation does not reach, so it keeps its veto there.
+        //
+        // A measured pseudo-translation on the row does NOT revoke the deferral on its own, and used
+        // to. It is already paid for, quantitatively: e_squared_expected divides the absent class by
+        // the depth the modulation puts on it before either the evidence or the violation count reads
+        // it, which is the same measurement restated on the scale it is judged against. Revoking the
+        // deferral as well charges one measurement twice, and charges it categorically - the screw
+        // claim then turns on which side of a fixed depth the estimator lands, and that estimate moves
+        // with anything upstream that changes which reflections enter the cone. Measured: masking a
+        // beam-stop arm - 2.3% of the detector, which IMPROVED the merge in every other respect - took
+        // one row's depth from 0.68 to 0.37 across the bound and cost an orthorhombic crystal both of
+        // its screws, on a half-integer vector its own Patterson does not carry, while the zone
+        // evidence rose. Where a modulation really does hide a row, the de-modulated evidence per
+        // reflection falls and the rate above refuses on its own.
         constexpr double SCREW_DEFERRAL_MIN_EVIDENCE_PER_ABSENT = 1.0;
         bool screw_deferral_ok = true;
         for (const auto& [row, z] : zones) {
@@ -1938,9 +2002,7 @@ SearchSpaceGroupResult SearchSpaceGroup(
                 screw_scored += z.n_absent;
                 best_zone_evidence = std::max(best_zone_evidence, ev);
             }
-            if (z.n_violations > 0 &&
-                (row_modulation.count(row) != 0 ||
-                 ev < SCREW_DEFERRAL_MIN_EVIDENCE_PER_ABSENT * z.n_absent))
+            if (z.n_violations > 0 && ev < SCREW_DEFERRAL_MIN_EVIDENCE_PER_ABSENT * z.n_absent)
                 screw_deferral_ok = false;
         }
         // ---- Glide zones ------------------------------------------------------------------------
@@ -2113,9 +2175,8 @@ SearchSpaceGroupResult SearchSpaceGroup(
             // carries rocking-curve tails that read as present at several sigma without being
             // structure factors, and a handful of them veto a class the evidence puts tens of nats
             // clear. Licensed zone by zone (screw_deferral_ok above): the deferral holds only where
-            // the zones carrying the violations are themselves dead per reflection and free of a
-            // measured pseudo-translation - on a subsidised or modulated zone the count is the only
-            // independent check left.
+            // the zones carrying the violations are themselves dead per reflection - on a zone
+            // subsidised by another row's evidence the count is the only independent check left.
             || (s.screw_absence_evidence >= opt.min_screw_absence_evidence && screw_deferral_ok);
         s.consistent = centering_ok && screw_ok;
         sg_scored[ci] = std::move(s);
@@ -2342,7 +2403,7 @@ std::string FinalistLedgerToText(const SearchSpaceGroupResult& result) {
 
     // How to read it. Every sentence here is something the numbers above have been measured to NOT
     // support, and each was a wrong reading somebody actually made.
-    os << "\n  READ IT AS AN ADMISSION TEST, NOT A RANKING: R/best rises with point-group order by\n"
+    os << "\n  THE TABLE IS AN ADMISSION TEST, NOT A RANKING: R/best rises with point-group order by\n"
           "  construction - a larger group adds more operators - so the smallest non-trivial subgroup\n"
           "  very often has the lowest R/best in the table. Sorting these rows and taking the minimum\n"
           "  would demote nearly every genuinely high-symmetry crystal. The question the table answers\n"
@@ -2353,7 +2414,7 @@ std::string FinalistLedgerToText(const SearchSpaceGroupResult& result) {
           "  DIAGNOSTIC ONLY - on the calibration set chi2/best and b/par put their LARGEST value on a\n"
           "  GENUINE crystal, with both known false cases inside the genuine range. A ratio to the\n"
           "  PARENT is contaminated whenever the parent is itself false, which is exactly the case\n"
-          "  these columns would have to catch. Do not read them as a ranking or a second opinion.\n"
+          "  these columns would have to catch. They are neither a ranking nor a second opinion.\n"
           "\n  BLIND SPOTS. This table is folded from merged intensities, so it can only see a\n"
           "  hypothesis that DEGRADES A MERGE. It is structurally blind to the other two ways a group\n"
           "  is over-called: a screw-axis over-call is in the same Laue class and folds a byte-identical\n"
@@ -2421,6 +2482,15 @@ std::string SearchSpaceGroupResultToText(const SearchSpaceGroupResult& result,
           "  no sigma in it. The promotion gate is the RATIO of the mean H over the operators a\n"
           "  promotion adds to the mean over the parent group's own, which is what separates a real\n"
           "  symmetry (ratio near 1) from a merohedral twin law.\n";
+    if (!result.generated_point_group_hm.empty())
+        os << "  The confirmed operators are NOT a group: what they generate is "
+           << result.generated_point_group_hm << ", which the per-operator bar did not admit, so a set"
+              " of operators\n  the data confirmed has a product the data refused. "
+           << result.generated_point_group_hm
+           << (result.generated_point_group_adopted
+                   ? " was offered as a candidate and ADOPTED."
+                   : " was offered as a candidate and refused by the tests below.")
+           << "\n";
     if (std::isfinite(result.h_ratio))
         os << "  H ratio " << FormatDouble(result.h_ratio, 2) << " for the adopted point group (bound "
            << FormatDouble(result.h_ratio_bound, 2) << ").\n";
diff --git a/image_analysis/scale_merge/SearchSpaceGroup.h b/image_analysis/scale_merge/SearchSpaceGroup.h
index 0332d21b8..6db1a2ed5 100644
--- a/image_analysis/scale_merge/SearchSpaceGroup.h
+++ b/image_analysis/scale_merge/SearchSpaceGroup.h
@@ -308,12 +308,12 @@ struct SearchSpaceGroupOptions {
     // scaled has already been measured to produce on these same four numbers. Re-measure it whenever
     // that scaling changes rather than trusting it through such a change.
     //
-    // 1.44, not the 1.78 those four numbers were read in. This bound and max_systematic_b_veto below
-    // are bounds on a RATIO of two b values, so their scale is set by how merge_systematic_b
-    // normalises its reduced chi^2 - and that normalisation changed, from the observation count N to
-    // the fit's degrees of freedom N - G. Every ratio in the corpus fell with it: a measured -23.7%
-    // median over three disjoint corpora, lower in 42 of 42 promotions, because the low-multiplicity
-    // parent loses a larger fraction of its dof than the candidate and so gains more b. Measured on
+    // 1.44, not the 1.78 those four numbers were read in. This bound is a bound on a RATIO of two b
+    // values, so its scale is set by how merge_systematic_b normalises its reduced chi^2 - and that
+    // normalisation changed, from the observation count N to the fit's degrees of freedom N - G.
+    // Every ratio in the corpus fell with it: a measured -23.7% median over three disjoint corpora,
+    // lower in 42 of 42 promotions, because the low-multiplicity parent loses a larger fraction of
+    // its dof than the candidate and so gains more b. Measured on
     // one trigonal crystal, same merge, only the divisor differing: the parent's b 0.126 -> 0.181
     // (+43%) against the candidate's 0.219 -> 0.254 (+16%), and the ratio 1.74 -> 1.40.
     //
@@ -326,40 +326,6 @@ struct SearchSpaceGroupOptions {
     // derivation that argued 1.38.
     double max_systematic_b_ratio = 1.44;
 
-    // Veto bound. The systematic-b test above is otherwise only a rescue - it can promote a chi^2-borderline
-    // genuine step but never demote a chi^2-passing one. A merohedral twin whose within-orbit scatter looks
-    // self-consistent (chi^2 ratio below max_merge_chi2_ratio) therefore slips through on chi^2 alone even
-    // though merging its non-equivalent reflections balloons b. So a chi^2-passing high-symmetry promotion
-    // whose b, relative to the largest confirmed subgroup, exceeds this bound is vetoed and kept in its true
-    // lower symmetry. Calibrated on the rotation-test battery against a merohedral R3->R32 twin at b-ratio
-    // ~2.6, with the largest genuine step then measured at ~1.8.
-    //
-    // That gap is far narrower than it looked: a genuine cubic 222 -> 23 step on weak low-energy data sits
-    // at 1.94. Masking the beam-stop shadow moved it to 2.07 and demoted the crystal - and it did so while
-    // IMPROVING both merges, because b is fitted against the merged sigmas and the subgroup's b improved
-    // more (0.164 -> 0.148) than the cubic merge's (0.319 -> 0.306). A ratio with 3% of headroom, which the
-    // measurement can move in either direction, cannot decide a symmetry on its own. So the veto is applied
-    // only where the H test has NOT confirmed the promotion: H compares intensities with intensities, has no
-    // sigma in it, and is the statistic that was actually measured to separate a twin (see
-    // max_operator_h_ratio). Where both fire the promotion is still refused, and every twin on the battery
-    // and in the synthetic harness fires both. The veto only ever keeps a clearly-ballooned promotion down,
-    // never promotes.
-    // 1.62 = 2.0 rescaled by the same 0.808 as max_systematic_b_ratio above, and for the same reason:
-    // it reads the same ratio, whose scale moved under it. This half is the less certain of the two -
-    // the veto has not been observed to fire on any corpus it has been measured over, so nothing
-    // measured says where it now sits - but leaving it in the old units while the statistic moved is
-    // the very mistake being corrected, and it would leave the veto systematically weaker than the
-    // calibration above intends.
-    double max_systematic_b_veto = 1.62;
-
-    // Floor on the parent's systematic-b when forming the veto ratio. On excellent data a genuine merge's
-    // b is near zero (ISa well above 20), so even a small, harmless absolute increase gives a huge b-ratio
-    // and the veto would wrongly reject real high symmetry (a true tetragonal 422 whose parent 222 sits at
-    // b=0.008 and 422 at b=0.049 - both tiny - reads as a 6x balloon). A real twin, by contrast, drives b
-    // to a large ABSOLUTE value (~0.19). Flooring the parent b here makes the ratio meaningful only once b
-    // is a non-negligible fraction of I; below the floor the increase is treated as noise, not a twin.
-    double min_systematic_b_for_veto = 0.05;
-
     // Promotion gate on the operator disagreement H = median|I1-I2|/(I1+I2), taken as the ratio of the
     // operators the promotion ADDS to the operators of the parent group already confirmed on the same
     // reflections. A real symmetry operator relates equal intensities, so its H matches the parent's
@@ -427,12 +393,11 @@ struct SearchSpaceGroupOptions {
     // intensity-weighted R (r_stat: a SUM, so the strong low-resolution reflections that carry the
     // contrast dominate it, where the median H under-weights them), and that R is judged against a
     // CLEAN reference. This is the one Stage-A gate whose reference cannot be contaminated by false
-    // operators: the H ratio and the systematic-b veto both normalise against the PARENT group, and a
-    // parent can itself be a false promotion (a pseudo-tetragonal 2 -> 222 -> 422 cascade confirms
-    // 222 by pooling the one real 2-fold with two false ones, so the 422 step is then measured
-    // against an already-contaminated 222, and every ratio reads ~1.4 and passes). It also acts on
-    // the first step out of P1, where there is no parent to normalise against at all and the operator
-    // CC floor stood alone. Sigma-free, so unlike the chi^2 and b gates it does not saturate with the
+    // operators: the H ratio normalises against the PARENT group, and a parent can itself be a false
+    // promotion (a pseudo-tetragonal 2 -> 222 -> 422 cascade confirms 222 by pooling the one real
+    // 2-fold with two false ones, so the 422 step is then measured against an already-contaminated
+    // 222, and every ratio reads ~1.4 and passes). It also acts on the first step out of P1, where
+    // there is no parent to normalise against at all and the operator CC floor stood alone. Sigma-free, so unlike the chi^2 and b gates it does not saturate with the
     // merge's ISa on a starved search merge.
     //
     // Two references, each scale-free so the bound means the same on every crystal (the property an
@@ -464,7 +429,8 @@ struct SearchSpaceGroupOptions {
     // chi^2 ratio then grows with point-group order for genuine high symmetry too and can no longer
     // arbitrate, so a promotion is confirmed on the systematic-b test alone (which re-fits its own error
     // and stays valid). A well-calibrated merge sits near 1; 3.0 (sigmas ~1.7x too small) marks the point
-    // where the ratio stops being trustworthy. The balloon veto still guards against a twin.
+    // where the ratio stops being trustworthy. The H and added-operator-R gates below still guard
+    // against a twin: both are necessary conditions no rescue can lift.
     double chi2_ref_reliable = 3.0;
 
     // Adopt this space group's point group instead of the one Stage A would choose, and go straight to
@@ -683,6 +649,17 @@ struct SearchSpaceGroupResult {
     // half-dataset intensities. Reported so a run shows the margin the gate had.
     double merge_r_floor = std::numeric_limits<double>::quiet_NaN();
 
+    // The point group the CONFIRMED OPERATORS GENERATE, when that group is not itself one of the
+    // candidates the operator bar admitted. A candidate is admitted only if EVERY one of its
+    // operators clears min_operator_cc, so a confirmed set whose products are not all confirmed
+    // leaves the search standing on a subgroup while holding evidence for something larger, and
+    // nothing says so. Where that happens the generated group - or, when the basis the merge is
+    // indexed on names no such group, the smallest candidate containing it - is offered as a
+    // candidate and judged by the same consistency tests as every other. Empty on the usual run,
+    // where the confirmed operators already form one of the candidates.
+    std::string generated_point_group_hm;
+    bool generated_point_group_adopted = false;
+
     // The half-integer pseudo-translation a screw zone was judged against, per axial row, in halves
     // ({1,1,1} is (1/2,1/2,1/2)), with the depth of the modulation it puts on that row. Empty when
     // the merge carries none, which is the usual case. A translation like this suppresses one parity
@@ -712,6 +689,11 @@ struct SearchSpaceGroupResult {
     // Empty when nothing was refused. Surfaced to the user - a silent demotion is how a twin gets missed.
     std::string refused_point_group_hm;
     std::string refused_reason;
+    // The symmorphic representative of that group - the same thing point_group_representative is, and
+    // for the same reason (a name cannot tell P321 from P312). It is what a caller hands back as
+    // fixed_point_group to ask what merging under the refused group would give. Unset when nothing
+    // was refused.
+    std::optional<gemmi::SpaceGroup> refused_point_group_representative;
 
     // Every operator-confirmed point-group hypothesis with its full evidence vector, ranked by order.
     // Report-only (see PointGroupLedgerEntry); the adoption above is unchanged by it. Empty on a search
diff --git a/image_analysis/scale_merge/TranslationalNCS.cpp b/image_analysis/scale_merge/TranslationalNCS.cpp
index eb08a926e..5fa3b1a96 100644
--- a/image_analysis/scale_merge/TranslationalNCS.cpp
+++ b/image_analysis/scale_merge/TranslationalNCS.cpp
@@ -379,6 +379,10 @@ TranslationalNCSResult AnalyzeTranslationalNCS(const std::vector<MergedReflectio
     // The Patterson peak says a vector exists; this says whether it modulates the data.
     std::vector<std::array<int, 3>> mod_hkl;
     std::vector<double> mod_e2;
+    // Where each kept resolution shell ends in the two arrays above. The null below shuffles the
+    // intensities inside a shell, exactly as the Patterson null does, and the shells are written
+    // consecutively, so their boundaries are all it needs.
+    std::vector<size_t> mod_shell_bounds{0};
     {
         std::vector<int> mod_idx;
         for (size_t i = 0; i < merged.size(); ++i) {
@@ -437,6 +441,7 @@ TranslationalNCSResult AnalyzeTranslationalNCS(const std::vector<MergedReflectio
                         mod_hkl.push_back({merged[i].h, merged[i].k, merged[i].l});
                         mod_e2.push_back(v);
                     }
+                    mod_shell_bounds.push_back(mod_e2.size());
                 }
             }
         }
@@ -446,15 +451,16 @@ TranslationalNCSResult AnalyzeTranslationalNCS(const std::vector<MergedReflectio
         return result;
 
     const int floor_count = std::max(50, result.n_modulation_reflections / (4 * kPhaseBins));
-    auto contrast = [&](const std::array<double, 3> &u, std::vector<double> *profile) {
+    auto contrast = [&](const std::vector<double> &e2v, const std::array<double, 3> &u,
+                        std::vector<double> *profile) {
         std::array<double, kPhaseBins> sum{}, cnt{};
         sum.fill(0.0);
         cnt.fill(0.0);
-        for (size_t i = 0; i < mod_e2.size(); ++i) {
+        for (size_t i = 0; i < e2v.size(); ++i) {
             const double t = mod_hkl[i][0] * u[0] + mod_hkl[i][1] * u[1] + mod_hkl[i][2] * u[2];
             const double f = t - std::floor(t);
             const int b = std::min(static_cast<int>(f * kPhaseBins), kPhaseBins - 1);
-            sum[b] += mod_e2[i];
+            sum[b] += e2v[i];
             cnt[b] += 1.0;
         }
         double lo = std::numeric_limits<double>::infinity(), hi = -lo;
@@ -480,9 +486,9 @@ TranslationalNCSResult AnalyzeTranslationalNCS(const std::vector<MergedReflectio
     // the Patterson peak. The Patterson grid is coarse and a real pseudo-translation is rarely at an
     // exactly rational position, so the peak position alone understates the modulation.
     const std::array<double, 3> step0{1.0 / nx, 1.0 / ny, 1.0 / nz};
-    auto refine = [&](std::array<double, 3> u) {
+    auto refine = [&](const std::vector<double> &e2v, std::array<double, 3> u) {
         std::array<double, 3> s = step0;
-        double best = contrast(u, nullptr);
+        double best = contrast(e2v, u, nullptr);
         for (int round = 0; round < 3; ++round) {
             for (bool improved = true; improved;) {
                 improved = false;
@@ -490,7 +496,7 @@ TranslationalNCSResult AnalyzeTranslationalNCS(const std::vector<MergedReflectio
                     for (double gstep : {-1.0, -0.5, 0.0, 0.5, 1.0}) {
                         std::array<double, 3> v = u;
                         v[i] += gstep * s[i];
-                        const double c = contrast(v, nullptr);
+                        const double c = contrast(e2v, v, nullptr);
                         if (std::isfinite(c) && c > best + 1e-6) {
                             best = c;
                             u = v;
@@ -504,27 +510,47 @@ TranslationalNCSResult AnalyzeTranslationalNCS(const std::vector<MergedReflectio
         return std::pair<std::array<double, 3>, double>{u, best};
     };
 
-    const auto [u_refined, best_contrast] = refine(result.peak_frac);
+    const auto [u_refined, best_contrast] = refine(mod_e2, result.peak_frac);
     if (!std::isfinite(best_contrast))
         return result;
     for (int i = 0; i < 3; ++i)
         result.vector_frac[i] = u_refined[i] - std::floor(u_refined[i]);
     result.modulation_measured = true;
     result.modulation = best_contrast;
-    contrast(u_refined, &result.phase_bin_mean_e2);
+    contrast(mod_e2, u_refined, &result.phase_bin_mean_e2);
     result.vector_length_A = DistanceToOrigin(cell, Vec3{result.vector_frac[0], result.vector_frac[1],
                                                          result.vector_frac[2]},
                                               std::vector<Vec3>{{0.0, 0.0, 0.0}});
 
-    // The modulation's own null: the SAME search from random starting vectors. A greedy search over
-    // three free parameters can manufacture contrast out of nothing, and this measures how much
-    // rather than assuming it is negligible.
+    // The modulation's own null: the SAME search, from the SAME start, on the same reflections with
+    // the intensities shuffled inside each resolution shell - the permutation the Patterson null
+    // above already uses, applied to the second half of the evidence. A greedy search over three
+    // free parameters can manufacture contrast out of nothing, and this measures how much rather
+    // than assuming it is negligible; the shuffle leaves the reflection count, the E^2 distribution
+    // and the phase-bin populations exactly as they were and removes only the one thing the
+    // modulation claims to see, the correlation between a reflection's intensity and h.u.
+    //
+    // Drawing the null from the unshuffled data instead - random starting vectors, the crystal's own
+    // intensities - measured the search AND whatever modulation the data carry, because a greedy
+    // search started anywhere walks into a real modulation's basin. Measured over 110 merged
+    // datasets: single draws reached 199x and 6162x where the crystal's own modulation read 4.0x and
+    // 67x, and 28 of the 110 had the control at or above the signal it was controlling for. The
+    // median was robust enough that this changes no verdict anywhere in that corpus - what it
+    // removes is a control that reads the same signal it is subtracted from, and with it the one
+    // way an upstream change can move the control while the modulation stands still.
     {
         std::mt19937 rng(seed + 7);
-        std::uniform_real_distribution<double> uni(0.0, 1.0);
+        std::vector<double> permuted = mod_e2;
         std::vector<double> nulls;
-        for (int i = 0; i < kModulationNullDraws; ++i) {
-            const auto [v, c] = refine({uni(rng), uni(rng), uni(rng)});
+        nulls.reserve(kModulationNullDraws);
+        for (int draw = 0; draw < kModulationNullDraws; ++draw) {
+            permuted = mod_e2;
+            for (size_t s = 1; s < mod_shell_bounds.size(); ++s) {
+                const size_t lo = mod_shell_bounds[s - 1], hi = mod_shell_bounds[s];
+                for (size_t i = hi; i > lo + 1; --i)
+                    std::swap(permuted[i - 1], permuted[lo + rng() % (i - lo)]);
+            }
+            const auto [v, c] = refine(permuted, result.peak_frac);
             (void) v;
             nulls.push_back(std::isfinite(c) ? c : 1.0);
         }
@@ -605,8 +631,9 @@ std::string TranslationalNCSToText(const TranslationalNCSResult &result) {
     if (result.near_extinct_class)
         os << "  => The class this vector suppresses is not weak but very nearly EXTINCT, which is\n"
            << "     what a lattice translation of a smaller cell looks like measured in a larger one.\n"
-           << "     Treat the reported cell as a supercell candidate rather than a settled result: a\n"
-           << "     cell with this translation as a lattice vector is the rival to check.\n";
+           << "     The reported cell is therefore a supercell candidate rather than a settled\n"
+           << "     result, and the rival hypothesis is a cell with this translation as a lattice\n"
+           << "     vector.\n";
     else if (result.commensurate)
         os << "  => The vector is a 1/" << result.commensurate_denominator
            << " translation of the cell, so the crystal is pseudo-centred. The cell itself is not in\n"
diff --git a/image_analysis/scale_merge/TwinningAnalysis.cpp b/image_analysis/scale_merge/TwinningAnalysis.cpp
index 9a8183d15..0a16c3cde 100644
--- a/image_analysis/scale_merge/TwinningAnalysis.cpp
+++ b/image_analysis/scale_merge/TwinningAnalysis.cpp
@@ -313,7 +313,7 @@ std::string TwinningAnalysisToText(const TwinningAnalysisResult& result) {
     if (result.twinning_suspected && result.estimated_twin_fraction > 0.01)
         os << "  => Twinning suspected (estimated twin fraction ~"
            << result.estimated_twin_fraction << "). Statistics flag the presence of twinning, not\n"
-           << "     the twin law; confirm with a dedicated twin-law analysis.\n";
+           << "     the twin law; the law itself is a question for a dedicated twin-law analysis.\n";
     else if (result.twinning_suspected)
         // The fraction is derived from the second moment alone, so a twin called by the L-test on a
         // crystal whose second moment sits at or above its untwinned value has no fraction to quote -
@@ -323,25 +323,26 @@ std::string TwinningAnalysisToText(const TwinningAnalysisResult& result) {
            << result.second_moment << ", at or\n"
            << "     above its untwinned 2.00), so no twin fraction is quoted"
            << (result.l_test_tncs_step_restricted
-                       ? " - and this crystal's translational pseudo-symmetry is a known reason for\n"
-                         "     the second moment to run high, so the L-test is the one to believe here.\n"
+                       ? " - and this\n"
+                         "     crystal's translational pseudo-symmetry is a known reason for the second\n"
+                         "     moment to run high, so the L-test carries the verdict here.\n"
                        : ".\n")
-           << "     Statistics flag the presence of twinning, not the twin law; confirm with a\n"
-           << "     dedicated twin-law analysis.\n";
+           << "     Statistics flag the presence of twinning, not the twin law; the law itself is\n"
+           << "     a question for a dedicated twin-law analysis.\n";
     else if (!result.merohedral_twinning_possible && result.laue_class_was_chosen_by_promotion)
         os << "  => Cannot rule out twinning from these numbers: the Laue class is holohedral, so no\n"
            << "     merohedral twin law exists WITHIN it - but this Laue class was chosen by the\n"
            << "     space-group search itself, and promoting into a twin's holohedry is precisely what\n"
-           << "     a merohedral twin looks like. Judge the twinning from the subgroup statistics\n"
-           << "     reported by the search, not from these.\n";
+           << "     a merohedral twin looks like. The subgroup statistics reported by the search,\n"
+           << "     not these numbers, are where the twinning is decided.\n";
     else if (!result.merohedral_twinning_possible)
         os << "  => No twinning: the Laue class is holohedral, so no merohedral twin law exists\n"
            << "     (any <|L|> below 0.5 here is a statistical artefact, not twinning).\n";
     else if (result.l_test_contaminated_by_tncs)
         os << "  => No twinning indicated by the second moment. The L-test, which is normally the\n"
            << "     stronger of the two, could not be read on this crystal (see above), so this is a\n"
-           << "     weaker statement than usual - if the space-group search reported subgroup\n"
-           << "     statistics, judge the twinning from those.\n";
+           << "     weaker statement than usual - where the space-group search reported subgroup\n"
+           << "     statistics, those are the stronger evidence.\n";
     else
         os << "  => No twinning indicated.\n";
     return os.str();
diff --git a/image_analysis/spot_finding/SpotFindingSettings.h b/image_analysis/spot_finding/SpotFindingSettings.h
index 897408920..281840394 100644
--- a/image_analysis/spot_finding/SpotFindingSettings.h
+++ b/image_analysis/spot_finding/SpotFindingSettings.h
@@ -6,6 +6,7 @@
 #include <cstddef>
 #include <optional>
 #include <cstdint>
+#include <vector>
 
 // Strong pixels above which the connected-component search gives up on a frame, unlabelled: an image
 // with this much of the detector over threshold is not a diffraction pattern, and it is what the
@@ -86,6 +87,14 @@ struct SpotFindingSettings {
     // JUNGFRAU is ~0.06 q, so the band half-width is ~0.03; 0.02 under-covered the strong low-res rings.
     float ice_ring_width_Q_recipA = 0.03;
 
+    // Powder rings measured from this run's own spots (ring centres in q = 2*pi/d), flagged alongside
+    // the fixed hexagonal-ice bands. Hexagonal ice is not the only thing that powders - a shower of
+    // microcrystals around the crystal, or salt out of the cryoprotectant, leaves the same textured
+    // rings at d-spacings no fixed list can name - and their spots are otherwise handed to the indexer
+    // as if they were this crystal's. Empty on a run that shows no such rings, which is nearly all of
+    // them; filled by the first pass only where excluding the rings is what lets the run index.
+    std::vector<float> measured_ring_q_recipA;
+
     bool indexing = true;
     bool quick_integration = true;
 
diff --git a/image_analysis/spot_finding/SpotUtils.cpp b/image_analysis/spot_finding/SpotUtils.cpp
index 433eb6610..7d345a804 100644
--- a/image_analysis/spot_finding/SpotUtils.cpp
+++ b/image_analysis/spot_finding/SpotUtils.cpp
@@ -1,6 +1,11 @@
 // SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
 // SPDX-License-Identifier: GPL-3.0-only
 
+#include <algorithm>
+#include <cmath>
+#include <limits>
+#include <optional>
+
 #include "../../common/JFJochMath.h"
 #include "SpotUtils.h"
 #include "../../common/ResolutionShells.h"
@@ -61,15 +66,167 @@ void MarkIceRings(std::vector<SpotToSave> &spots, float tolerance_q_recipA) {
     for (const auto &i: ICE_RING_RES_A)
         ice_rings_q.push_back(2 * PI / i);
 
+    for (auto &s: spots)
+        s.ice_ring = false;
+
+    MarkRings(spots, ice_rings_q, tolerance_q_recipA);
+}
+
+void MarkRings(std::vector<SpotToSave> &spots, const std::vector<float> &rings_q_recipA,
+               float tolerance_q_recipA) {
+    if (rings_q_recipA.empty())
+        return;
+
     for (auto &s: spots) {
-        auto spot_q = 2 * PI / s.d_A;
-        bool tmp = false;
-        for (const auto &q: ice_rings_q)
-            tmp |= (fabs(spot_q - q) < tolerance_q_recipA);
-        s.ice_ring = tmp;
+        if (!(s.d_A > 0.0f))
+            continue;
+        const float spot_q = 2 * PI / s.d_A;
+        for (const float q: rings_q_recipA)
+            if (fabs(spot_q - q) < tolerance_q_recipA) {
+                s.ice_ring = true;
+                break;
+            }
     }
 }
 
+namespace {
+    // A bin has to hold this many spots before its excess is looked at, so a pair of noise detections
+    // in an otherwise empty bin cannot pose as a ring.
+    constexpr int64_t RING_MIN_SPOTS_PER_BIN = 8;
+    // ... and the excess over the local baseline has to be this many times its Poisson noise, AND
+    // this large a fraction of the baseline. Both, because either alone fails at one end of the
+    // range: the Poisson test alone calls a 5% rise a ring where the pool is large, and the fractional
+    // test alone calls a two-spot bin a ring where it is small.
+    constexpr float RING_MIN_SIGMA = 4.0f;
+    constexpr float RING_MIN_EXCESS_FRACTION = 1.0f;
+    // Bins of the running median that sets the baseline. Wide compared with the 2-3 bins a ring covers,
+    // so the rings themselves do not pull the median up, and narrow compared with the whole q range,
+    // so it still follows the fall-off of spot density with resolution.
+    constexpr size_t RING_BASELINE_BINS = 41;
+    // Past the q where this share of a baseline window's bins are ring bins, the rings have merged:
+    // the median that the excess is measured against is itself a ring value, and nothing further out
+    // can be told from the crystal. Half, because that is what "the median is a ring" means - it is
+    // the definition of the running median failing, not a tuned number.
+    constexpr float RING_MERGED_BIN_FRACTION = 0.5f;
+    // The pool a measurement needs at all. Below this the histogram is counting statistics.
+    constexpr size_t RING_MIN_POOLED_SPOTS = 500;
+    // The share of the spots the rings have to hold before they are a PHASE rather than the crystal's
+    // own rows. Every pattern has some q bins fuller than their neighbours - a crystal with a short
+    // axis puts its reflections in sheets - and calling those a contaminant would be wrong. Calibrated
+    // on the 100-dataset open battery, where the measured fractions run as a continuum from 83% down:
+    // the sets with a visible powder sit at 8-83%, and below about a twentieth the "rings" are two or
+    // three bins holding a percent of the spots, which every clean crystal in that battery also shows.
+    constexpr float RING_MIN_SPOT_FRACTION = 0.05f;
+}
+
+PowderRings MeasurePowderRings(const std::vector<float> &spot_q_recipA, float half_width_q_recipA) {
+    PowderRings out;
+    if (!(half_width_q_recipA > 0.0f) || spot_q_recipA.size() < RING_MIN_POOLED_SPOTS)
+        return out;
+
+    float q_min = std::numeric_limits<float>::max(), q_max = 0.0f;
+    for (const float q : spot_q_recipA) {
+        if (!(q > 0.0f)) continue;
+        q_min = std::min(q_min, q);
+        q_max = std::max(q_max, q);
+    }
+    if (!(q_max > q_min))
+        return out;
+
+    // One bin per ring half-width, so a ring covers two or three of them.
+    const size_t nbins = static_cast<size_t>((q_max - q_min) / half_width_q_recipA) + 1;
+    if (nbins < RING_BASELINE_BINS)
+        return out;
+
+    std::vector<int64_t> count(nbins, 0);
+    int64_t total = 0;
+    for (const float q : spot_q_recipA) {
+        if (!(q > 0.0f)) continue;
+        const auto bin = static_cast<size_t>((q - q_min) / half_width_q_recipA);
+        if (bin < nbins) { count[bin]++; total++; }
+    }
+    if (total == 0)
+        return out;
+
+    // Running median of the counts. The window is clipped at the ends rather than padded, so the first
+    // and last few bins are judged against the baseline of the range they have.
+    std::vector<float> baseline(nbins, 0.0f);
+    std::vector<int64_t> window;
+    window.reserve(RING_BASELINE_BINS);
+    for (size_t i = 0; i < nbins; i++) {
+        const size_t lo = i > RING_BASELINE_BINS / 2 ? i - RING_BASELINE_BINS / 2 : 0;
+        const size_t hi = std::min(nbins, i + RING_BASELINE_BINS / 2 + 1);
+        window.assign(count.begin() + static_cast<long>(lo), count.begin() + static_cast<long>(hi));
+        std::ranges::nth_element(window, window.begin() + static_cast<long>(window.size() / 2));
+        baseline[i] = static_cast<float>(window[window.size() / 2]);
+    }
+
+    std::vector<char> is_ring(nbins, 0);
+    for (size_t i = 0; i < nbins; i++) {
+        const float excess = static_cast<float>(count[i]) - baseline[i];
+        is_ring[i] = count[i] >= RING_MIN_SPOTS_PER_BIN
+                  && excess > RING_MIN_SIGMA * std::sqrt(std::max(baseline[i], 1.0f))
+                  && excess > RING_MIN_EXCESS_FRACTION * baseline[i];
+    }
+
+    // Where the rings have merged. Read outwards over the same window the baseline uses: the first q
+    // at which ring bins are the majority of that window is where the measurement stops meaning
+    // anything, and everything past it is left alone.
+    for (size_t i = RING_BASELINE_BINS / 2; i + RING_BASELINE_BINS / 2 < nbins; i++) {
+        size_t n_ring = 0;
+        for (size_t j = i - RING_BASELINE_BINS / 2; j <= i + RING_BASELINE_BINS / 2; j++)
+            n_ring += is_ring[j] ? 1 : 0;
+        if (static_cast<float>(n_ring) > RING_MERGED_BIN_FRACTION * static_cast<float>(RING_BASELINE_BINS)) {
+            out.resolved_to_d_A = 2 * PI / (q_min + static_cast<float>(i) * half_width_q_recipA);
+            break;
+        }
+    }
+
+    // Contiguous runs of ring bins are one ring, placed at their count-weighted centre.
+    double excess_total = 0.0;
+    size_t run_start = nbins;
+    const auto close_run = [&](size_t run_end) {
+        double num = 0.0, den = 0.0;
+        for (size_t j = run_start; j < run_end; j++) {
+            const auto w = static_cast<double>(count[j]) - baseline[j];
+            num += w * (q_min + (static_cast<double>(j) + 0.5) * half_width_q_recipA);
+            den += w;
+        }
+        if (den > 0.0) {
+            out.rings_q_recipA.push_back(static_cast<float>(num / den));
+            excess_total += den;
+        }
+        run_start = nbins;
+    };
+    for (size_t i = 0; i < nbins; i++) {
+        if (is_ring[i] && run_start == nbins)
+            run_start = i;
+        else if (!is_ring[i] && run_start != nbins)
+            close_run(i);
+    }
+    if (run_start != nbins)
+        close_run(nbins);
+
+    out.spot_fraction = static_cast<float>(excess_total / static_cast<double>(total));
+    if (out.spot_fraction < RING_MIN_SPOT_FRACTION)
+        return {};   // measured, and it is not a phase
+    return out;
+}
+
+std::optional<float> SpotResolutionQuantile(const std::vector<float> &spot_q_recipA, float fraction) {
+    if (spot_q_recipA.size() < RING_MIN_POOLED_SPOTS || !(fraction > 0.0f) || !(fraction < 1.0f))
+        return std::nullopt;
+    std::vector<float> q;
+    q.reserve(spot_q_recipA.size());
+    for (const float v : spot_q_recipA)
+        if (v > 0.0f) q.push_back(v);
+    if (q.size() < RING_MIN_POOLED_SPOTS)
+        return std::nullopt;
+    const auto rank = static_cast<long>(static_cast<float>(q.size()) * fraction);
+    std::ranges::nth_element(q, q.begin() + rank);
+    return q[rank] > 0.0f ? std::optional<float>(2 * PI / q[rank]) : std::nullopt;
+}
+
 void FilterSpotsByCount(std::vector<SpotToSave> &input, int64_t count, bool deprioritise_ice) {
     size_t output_size = std::min<size_t>(input.size(), count);
 
@@ -226,6 +383,13 @@ void SpotAnalyze(const DiffractionExperiment &experiment,
 
     CountSpots(output, spots_out, spot_finding_settings.cutoff_spot_count_low_res);
 
+    // The rings this run measured for itself, flagged after the ice counters above so those go on
+    // reporting hexagonal ice and only hexagonal ice, and before the resolution estimate and the spot
+    // budget below, which both want the contaminant out of the way: a powder ring reaching the corner
+    // of the detector otherwise sets the estimate, and the budget otherwise spends itself on it.
+    MarkRings(spots_out, spot_finding_settings.measured_ring_q_recipA,
+              spot_finding_settings.ice_ring_width_Q_recipA);
+
     // 0 spells "no limit" everywhere else the limit is read (value_or(0) then compares against it), so it
     // has to mean the same here - passing it on as a resolution makes ResolutionShells throw per image.
     const auto &spot_d_min = spot_finding_settings.high_resolution_limit;
diff --git a/image_analysis/spot_finding/SpotUtils.h b/image_analysis/spot_finding/SpotUtils.h
index 1eaa5f03e..090fba330 100644
--- a/image_analysis/spot_finding/SpotUtils.h
+++ b/image_analysis/spot_finding/SpotUtils.h
@@ -20,6 +20,44 @@ float CountIceRingControlSpots(const std::vector<SpotToSave> &spots, float half_
 
 void MarkIceRings(std::vector<SpotToSave> &spots, float tolerance_q_recipA);
 
+// Flag every spot sitting within tolerance of one of the given ring positions (q = 2*pi/d). The same
+// flag MarkIceRings sets, because it means the same thing downstream: a spot that belongs to a powder
+// ring and not to this crystal.
+void MarkRings(std::vector<SpotToSave> &spots, const std::vector<float> &rings_q_recipA,
+               float tolerance_q_recipA);
+
+// What a POOLED spot list says about powder contamination: a crystalline phase other than the
+// crystal, diffracting as rings the crystal's own reflections sit among. Hexagonal ice has a fixed
+// list of rings and MarkIceRings above; nothing else that powders does - a shower of microcrystals
+// around the crystal, salt out of the cryoprotectant, a phase nobody expected - and on such a pattern
+// the contaminant's spots can outnumber the crystal's several times over in every frame.
+//
+// A ring is a q bin holding far more spots than the smooth spot-density fall-off around it. The
+// baseline is a running median over a window wide compared with a ring, so it follows that fall-off
+// without following the rings themselves. Pool over frames spread across the sweep: a powder ring is
+// on every frame and the crystal's own rows are not, so pooling sharpens the rings and flattens
+// everything else.
+struct PowderRings {
+    // Ring centres, q = 2*pi/d. Empty on a pattern that shows no rings, which is most of them.
+    std::vector<float> rings_q_recipA;
+    // The share of the pooled spots that the rings hold OVER the baseline - what the contaminant
+    // contributes, not what happens to lie in a ring band. 0 where there is nothing.
+    float spot_fraction = 0.0f;
+    // How far the rings can be told apart, in A. A powder's rings crowd together as q grows, and past
+    // the point where ring bins are the majority of bins the baseline is itself made of rings and a
+    // ring no longer measures as one. Nothing finer than this can be separated from the crystal, so
+    // it is the resolution an indexing pass can be asked to trust on such a pattern. Absent where the
+    // rings stay separable over the whole range, which is the ordinary case.
+    std::optional<float> resolved_to_d_A;
+};
+PowderRings MeasurePowderRings(const std::vector<float> &spot_q_recipA, float half_width_q_recipA);
+
+// The resolution (A) that this fraction of a pooled spot list lies COARSER than. A first pass that
+// stops here is given that share of the spots, whatever the detector reaches and whatever the
+// crystal's fall-off looks like - so it scales to any dataset without a resolution written into the
+// program. Returns nothing on a pool too small to have quantiles.
+std::optional<float> SpotResolutionQuantile(const std::vector<float> &spot_q_recipA, float fraction);
+
 // Keep the strongest `count` spots. With deprioritise_ice, spots on the hexagonal ice bands are ordered
 // last and so are the first to go; pass false where the run has no measurable ice, in which case the
 // flag marks ordinary reflections and ordering on it would discard good data.
diff --git a/image_puller/TCPImagePuller.cpp b/image_puller/TCPImagePuller.cpp
index 9fd200658..fdb5e792c 100644
--- a/image_puller/TCPImagePuller.cpp
+++ b/image_puller/TCPImagePuller.cpp
@@ -433,6 +433,12 @@ void TCPImagePuller::Disconnect() {
 
     CloseSocket();
 
+    // Same reason as in ZMQImagePuller: once the puller is going away nobody drains outside_fifo,
+    // so a full queue would leave CBORThread blocked in PutBlocking and the joins below hanging.
+    cbor_fifo.Stop();
+    repub_fifo.Stop();
+    outside_fifo.Stop();
+
     if (receiver_thread.joinable())
         receiver_thread.join();
     if (cbor_thread.joinable())
diff --git a/image_puller/ZMQImagePuller.cpp b/image_puller/ZMQImagePuller.cpp
index 28efff8fe..5078dd593 100644
--- a/image_puller/ZMQImagePuller.cpp
+++ b/image_puller/ZMQImagePuller.cpp
@@ -36,6 +36,14 @@ ZMQImagePuller::~ZMQImagePuller() {
 void ZMQImagePuller::Disconnect() {
     disconnect = 1;
 
+    // The threads below hand messages on through bounded blocking queues, and by the time a puller
+    // is disconnected nothing drains outside_fifo any more - the receiver that did is gone. A full
+    // queue would then park CBORThread in PutBlocking for ever, back up cbor_fifo and park
+    // PullerThread too, and the joins below would never return. Stop() releases them.
+    cbor_fifo.Stop();
+    repub_fifo.Stop();
+    outside_fifo.Stop();
+
     if (puller_thread.joinable())
         puller_thread.join();
     if (cbor_thread.joinable())
diff --git a/licenses/COLLECT.sh b/licenses/COLLECT.sh
index c6397dd60..e2bb01b95 100644
--- a/licenses/COLLECT.sh
+++ b/licenses/COLLECT.sh
@@ -47,6 +47,7 @@ copy_license libzmq.txt              "$(find_dep libzmq-src/LICENSE)"
 copy_license libtiff.txt             "$(find_dep tiff-src/LICENSE.md)"
 copy_license fftw.txt                "$(find_dep fftw-src/COPYING)"
 copy_license ceres-solver.txt        "$(find_dep ceres-src/LICENSE)"
+copy_license abseil.txt              "$(find_dep ceres-src/third_party/abseil-cpp/LICENSE)"
 copy_license fast-feedback-indexer.txt "$(find_dep fast-indexer-src/LICENSE.md)"
 copy_license eigen.txt               "$(find_dep eigen3-src/COPYING.MPL2)"
 copy_license eigen-README.txt        "$(find_dep eigen3-src/COPYING.README)"
@@ -57,6 +58,10 @@ copy_license slsDetectorPackage-LGPL-3.0.txt "$(find_dep sls_detector_package-sr
 copy_license slsDetectorPackage-GPL-3.0.txt  "$(find_dep sls_detector_package-src/LICENSES/GPL-3.0)"
 
 # libjpeg-turbo is built out-of-line by preview/ (ExternalProject), not under _deps.
+# libcurl is fetched only for viewer builds, so this one is MISSING unless the configured tree
+# had JFJOCH_VIEWER_BUILD / JFJOCH_VIEWER_ONLY on.
+copy_license curl.txt                "$(find_dep curl-src/COPYING)"
+
 copy_license libjpeg-turbo.txt \
     cmake-build-release/preview/libjpeg-turbo/src/libjpeg-turbo-project/LICENSE.md \
     build/preview/libjpeg-turbo/src/libjpeg-turbo-project/LICENSE.md
diff --git a/licenses/abseil.txt b/licenses/abseil.txt
new file mode 100644
index 000000000..ccd61dcfe
--- /dev/null
+++ b/licenses/abseil.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/licenses/curl.txt b/licenses/curl.txt
new file mode 100644
index 000000000..2f71d999a
--- /dev/null
+++ b/licenses/curl.txt
@@ -0,0 +1,22 @@
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1996 - 2026, Daniel Stenberg, <daniel@haxx.se>, and many
+contributors, see the THANKS file.
+
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
diff --git a/licenses/eigen-README.txt b/licenses/eigen-README.txt
index 11af93ca7..de5b63215 100644
--- a/licenses/eigen-README.txt
+++ b/licenses/eigen-README.txt
@@ -2,5 +2,17 @@ Eigen is primarily MPL2 licensed. See COPYING.MPL2 and these links:
   http://www.mozilla.org/MPL/2.0/
   http://www.mozilla.org/MPL/2.0/FAQ.html
 
-Some files contain third-party code under BSD or other MPL2-compatible licenses,
-whence the other COPYING.* files here.
\ No newline at end of file
+Some files contain third-party code under BSD or LGPL licenses, whence the other
+COPYING.* files here.
+
+All the LGPL code is either LGPL 2.1-only, or LGPL 2.1-or-later.
+For this reason, the COPYING.LGPL file contains the LGPL 2.1 text.
+
+If you want to guarantee that the Eigen code that you are #including is licensed
+under the MPL2 and possibly more permissive licenses (like BSD), #define this
+preprocessor symbol:
+  EIGEN_MPL2_ONLY
+For example, with most compilers, you could add this to your project CXXFLAGS:
+  -DEIGEN_MPL2_ONLY
+This will cause a compilation error to be generated if you #include any code that is
+LGPL licensed.
diff --git a/licenses/eigen.txt b/licenses/eigen.txt
index ee6256cdb..14e2f777f 100644
--- a/licenses/eigen.txt
+++ b/licenses/eigen.txt
@@ -357,7 +357,7 @@ Exhibit A - Source Code Form License Notice
 
   This Source Code Form is subject to the terms of the Mozilla Public
   License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 If it is not possible or desirable to put the notice in a particular
 file, then You may include the notice in a location (such as a LICENSE
diff --git a/licenses/hdf5.txt b/licenses/hdf5.txt
index 60abcc29c..e7fd95cdf 100644
--- a/licenses/hdf5.txt
+++ b/licenses/hdf5.txt
@@ -108,4 +108,177 @@ and/or accompanying materials:
 Portions of HDF5 were developed with support from the National Science
 Foundation under Federal Award No. 2534078.
 
------------------------------------------------------------------------------
\ No newline at end of file
+-----------------------------------------------------------------------------                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
\ No newline at end of file
diff --git a/licenses/libjpeg-turbo.txt b/licenses/libjpeg-turbo.txt
index 2204864fa..37a489b24 100644
--- a/licenses/libjpeg-turbo.txt
+++ b/licenses/libjpeg-turbo.txt
@@ -8,18 +8,46 @@ libjpeg-turbo is covered by two compatible BSD-style open source licenses:
 
   This license applies to the libjpeg API library and associated programs,
   including any code inherited from libjpeg and any modifications to that
-  code.  Note that the libjpeg-turbo SIMD source code bears the
-  [zlib License](https://opensource.org/licenses/Zlib), but in the context of
-  the overall libjpeg API library, the terms of the zlib License are subsumed
-  by the terms of the IJG License.
+  code.
 
 - The Modified (3-clause) BSD License, which is listed below
 
-  This license applies to the TurboJPEG API library and associated programs, as
-  well as the build system.  Note that the TurboJPEG API library wraps the
-  libjpeg API library, so in the context of the overall TurboJPEG API library,
-  both the terms of the IJG License and the terms of the Modified (3-clause)
-  BSD License apply.
+  This license applies to the TurboJPEG API library and associated programs,
+  [libspng](https://libspng.org) (which is used by cjpeg and djpeg), and the
+  build/test system.
+
+  * The TurboJPEG API library wraps the libjpeg API library, so in the context
+    of the overall TurboJPEG API library, both the terms of the IJG License and
+    the terms of the Modified (3-clause) BSD License apply.
+  * cjpeg and djpeg use libspng, so in the context of those programs, both the
+    terms of the IJG License and the terms of the Modified (3-clause) BSD
+    License apply.
+
+
+Component Licenses
+==================
+
+Some of libjpeg-turbo's modules and internal dependencies are covered by less
+restrictive licenses, but in the context of libjpeg-turbo as a whole, the terms
+of the less restrictive licenses are subsumed by either the IJG License or the
+Modified BSD License.  (In other words, the terms of the less restrictive
+licenses are satisfied if the terms of the IJG and Modified BSD Licenses are
+satisfied.)
+
+- The libjpeg-turbo SIMD source code and zlib are covered by the
+  [zlib License](https://spdx.org/licenses/Zlib.html), which is subsumed by the
+  IJG License in the context of the cjpeg and djpeg programs and the libjpeg
+  API library.
+
+- Some of the libspng source code is covered by the
+  [PNG Reference Library License v2](https://spdx.org/licenses/libpng-2.0.html),
+  which is subsumed by the IJG License in the context of the cjpeg and djpeg
+  programs and the TurboJPEG API library.
+
+- Most of the libspng source code is covered by the
+  [Simplified (2-clause) BSD License](https://spdx.org/licenses/BSD-2-Clause.html),
+  which is subsumed by the Modified BSD License in the context of the cjpeg and
+  djpeg programs and the TurboJPEG API library.
 
 
 Complying with the libjpeg-turbo Licenses
@@ -38,7 +66,6 @@ intended solely for clarification.
         **Origin**
         - Clause 1 of the IJG License
         - Clause 1 of the Modified BSD License
-        - Clauses 1 and 3 of the zlib License
 
     2.  You must add your own copyright notice to the header of each source
         file you modified, so others can tell that you modified that file.  (If
@@ -47,7 +74,6 @@ intended solely for clarification.
 
         **Origin**
         - Clause 1 of the IJG License
-        - Clause 2 of the zlib License
 
     3.  You must include the IJG README file, and you must not alter any of the
         copyright or license text in that file.
@@ -67,9 +93,9 @@ intended solely for clarification.
         **Origin**
         - Clause 2 of the IJG license
 
-    2.  If your binary distribution includes or uses the TurboJPEG API, then
-        your product documentation must include the text of the Modified BSD
-        License (see below.)
+    2.  If your binary distribution includes or uses the TurboJPEG API or
+        associated programs, cjpeg, or djpeg, then your product documentation
+        must include the text of the Modified BSD License (see below.)
 
         **Origin**
         - Clause 2 of the Modified BSD License
@@ -81,21 +107,20 @@ intended solely for clarification.
     - IJG License
     - Clause 3 of the Modified BSD License
 
-4.  The IJG and The libjpeg-turbo Project do not warrant libjpeg-turbo to be
-    free of defects, nor do we accept any liability for undesirable
-    consequences resulting from your use of the software.
+4.  The authors and distributors do not warrant libjpeg-turbo to be free of
+    defects, nor do we accept any liability for undesirable consequences
+    resulting from your use of the software.
 
     **Origin**
     - IJG License
     - Modified BSD License
-    - zlib License
 
 
 The Modified (3-clause) BSD License
 ===================================
 
-Copyright (C)2009-2023 D. R. Commander.  All Rights Reserved.<br>
-Copyright (C)2015 Viktor Szathmáry.  All Rights Reserved.
+Copyright (C) 2009-2026 D. R. Commander<br>
+Copyright (C) 2018-2023 Randy <randy408@protonmail.com>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -120,16 +145,3 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-
-Why Two Licenses?
-=================
-
-The zlib License could have been used instead of the Modified (3-clause) BSD
-License, and since the IJG License effectively subsumes the distribution
-conditions of the zlib License, this would have effectively placed
-libjpeg-turbo binary distributions under the IJG License.  However, the IJG
-License specifically refers to the Independent JPEG Group and does not extend
-attribution and endorsement protections to other entities.  Thus, it was
-desirable to choose a license that granted us the same protections for new code
-that were granted to the IJG for code derived from their software.
diff --git a/preview/CMakeLists.txt b/preview/CMakeLists.txt
index 8fac07fa8..2b0c38547 100644
--- a/preview/CMakeLists.txt
+++ b/preview/CMakeLists.txt
@@ -15,8 +15,8 @@ SET(LIBJPEG_TURBO_LIBRARY "${LIBJPEG_TURBO_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFI
 SET(LIBJPEG_TURBO_INCLUDE_DIRS "${LIBJPEG_TURBO_DIR}/include")
 
 ExternalProject_Add(libjpeg-turbo-project
-        GIT_REPOSITORY https://github.com/libjpeg-turbo/libjpeg-turbo
-        GIT_TAG 3.0.4
+        URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.2.0.tar.gz
+        URL_HASH SHA256=980dd81f425082aa6d7c9e47fef27554ce7a9ffc8e2f6e863b97d263c5c50858
         PREFIX "${LIBJPEG_TURBO_DIR}"
         INSTALL_DIR "${LIBJPEG_TURBO_DIR}"
         BUILD_BYPRODUCTS "${LIBJPEG_TURBO_LIBRARY}"
diff --git a/reader/HDF5MetadataSource.cpp b/reader/HDF5MetadataSource.cpp
index fb6f67488..e65edee4e 100644
--- a/reader/HDF5MetadataSource.cpp
+++ b/reader/HDF5MetadataSource.cpp
@@ -596,6 +596,14 @@ HDF5MetadataSource::OpenResult HDF5MetadataSource::Open(const std::string &filen
                             master_file->ReadElement<std::string>("/entry/MX/sweepQualityReasons", i)
                                     .value_or(""));
                 }
+                dataset->frame_disposition = master_file->ReadOptVector<uint8_t>("/entry/MX/frameDisposition");
+                if (master_file->Exists("/entry/MX/frameDispositionCodes")) {
+                    const auto dim = master_file->GetDimension("/entry/MX/frameDispositionCodes");
+                    for (size_t i = 0; i < (dim.empty() ? 0 : dim[0]); i++)
+                        dataset->frame_disposition_codes.push_back(
+                            master_file->ReadElement<std::string>("/entry/MX/frameDispositionCodes", i)
+                                    .value_or(""));
+                }
             }
             if (master_file->Exists("/entry/image"))
                 dataset->max_value = master_file->ReadOptVector<int64_t>("/entry/image/max_value");
diff --git a/reader/JFJochCBFReader.cpp b/reader/JFJochCBFReader.cpp
index 7d554119f..2556df484 100644
--- a/reader/JFJochCBFReader.cpp
+++ b/reader/JFJochCBFReader.cpp
@@ -152,16 +152,21 @@ std::optional<DetectorOrientation> ImageOrientation(const minicbf::Header &h) {
 // scan turns about the base axis however the cradle is set - which is why a header carrying a large
 // fixed chi still comes out as the base axis here - and only a phi scan is carried by chi and by
 // omega. Chi turns about the beam, as the imgCIF axis convention has it, pointing back at the
-// source; internal z points the other way, hence the minus. A kappa arm cannot be expressed at all:
-// its inclination is a property of the hardware that no miniCBF header states.
+// source; internal z points the other way, hence the minus. A head whose inner circle is inclined -
+// a fixed-chi stage, a kappa arm - states that inclination in its axis table and nowhere else.
 Coord RotationAxis(const minicbf::Header &h) {
     const Coord base = BaseAxis(h);
     if (!minicbf::ScansPhi(h))
         return base;
 
     const auto rad = [](double deg) { return static_cast<float>(deg * PI / 180.0); };
+    // Where the table states the inner axis outright, that IS the inclination, and the driven-circle
+    // angles do not describe it: a fixed-chi stage carries phi at a standing angle to the base with
+    // no chi circle to report, so "# Chi" reads zero while the axis is tens of degrees away.
     const Coord chi_axis(0.0f, 0.0f, -1.0f);
-    const Coord tilted = RotMatrix(rad(h.chi_deg.value_or(0.0)), chi_axis) * base;
+    const Coord tilted = h.inner_spindle_axis.has_value()
+                             ? ImgCIFToInternal(*h.inner_spindle_axis)
+                             : RotMatrix(rad(h.chi_deg.value_or(0.0)), chi_axis) * base;
     return RotMatrix(rad(h.omega_deg.value_or(0.0)), base) * tilted;
 }
 
diff --git a/reader/JFJochReaderDataset.h b/reader/JFJochReaderDataset.h
index cc50376eb..9d82b2b5a 100644
--- a/reader/JFJochReaderDataset.h
+++ b/reader/JFJochReaderDataset.h
@@ -76,6 +76,12 @@ struct JFJochReaderDataset {
     std::vector<uint8_t> sweep_quality;
     std::vector<std::string> sweep_quality_reasons;
 
+    // Per-image disposition from /entry/MX/frameDisposition: a 0-based index into
+    // frame_disposition_codes (merged, downgraded, rejected). What was DONE with the image, where
+    // sweep_quality above says what was SEEN.
+    std::vector<uint8_t> frame_disposition;
+    std::vector<std::string> frame_disposition_codes;
+
     // Maps this dataset's image index -> the original/collected image number it came from.
     // Empty means identity (image i == original image i). Lets a dataset be a subset (or strided
     // selection) of the truly collected images: reprocessing snapshots over a sub-range, and (in
diff --git a/reader/MiniCBF.cpp b/reader/MiniCBF.cpp
index 14d6b8208..3b4626b03 100644
--- a/reader/MiniCBF.cpp
+++ b/reader/MiniCBF.cpp
@@ -194,6 +194,8 @@ void ParseAxisTable(const std::string &text, Header &h) {
                 h.spindle_axis = v;
             else if (equipment == "detector")
                 h.detector_axis = v;
+        } else if ((type == "rotation") && (equipment == "goniometer")) {
+            h.inner_spindle_axis = v;   // carried by the base axis: a fixed-chi or kappa inclination
         }
     }
 
diff --git a/reader/MiniCBF.h b/reader/MiniCBF.h
index dd8cb92a1..9cb3fd96d 100644
--- a/reader/MiniCBF.h
+++ b/reader/MiniCBF.h
@@ -54,6 +54,11 @@ struct Header {
     std::optional<std::array<double, 3>> fast_direction;   // laboratory direction of a +1 column step
     std::optional<std::array<double, 3>> slow_direction;   // ... of a +1 row step
     std::optional<std::array<double, 3>> spindle_axis;     // the base goniometer rotation axis
+    // The goniometer rotation axis carried by the base one, stated in the base axis' own frame. A
+    // head whose inner circle is INCLINED - a fixed-chi stage, a kappa arm - says so only here: its
+    // "# Chi" and "# Kappa" lines read zero because no such circle is driven. Empty where the table
+    // states one rotation axis only, which is every Eulerian head.
+    std::optional<std::array<double, 3>> inner_spindle_axis;
     std::optional<std::array<double, 3>> detector_axis;    // the detector's own rotation axis: a 2theta arm
     // "# Oscillation_axis X.CW +SLOW". Some writers say which of the two image directions the spindle
     // runs along instead of stating a vector. The axis NAME on that line is a poor discriminator (see
diff --git a/receiver/JFJochReceiverLite.cpp b/receiver/JFJochReceiverLite.cpp
index d642ea471..a83d63156 100644
--- a/receiver/JFJochReceiverLite.cpp
+++ b/receiver/JFJochReceiverLite.cpp
@@ -128,11 +128,23 @@ JFJochReceiverLite::~JFJochReceiverLite() {
 
 void JFJochReceiverLite::MeasurementThread() {
     try {
-        // Wait for start message to arrive
+        // Wait for start message to arrive. Once the detector has reported it is done, nothing
+        // more is coming: allow a start message that is still in flight to land, then give up.
+        // Without this the poll runs for ever - a detector that never streamed leaves Stop()
+        // waiting on this thread with no way out other than a cancel from the operator.
+        std::optional<std::chrono::steady_clock::time_point> give_up_at;
         auto msg = image_puller.PollImage();
 
-        while (!cancelled && (!msg.has_value() || !msg->cbor || !msg->cbor->start_message))
+        while (!cancelled && (!msg.has_value() || !msg->cbor || !msg->cbor->start_message)) {
+            if (detector_finished && !give_up_at)
+                give_up_at = std::chrono::steady_clock::now() + StartMessageGrace;
+            if (give_up_at && (std::chrono::steady_clock::now() > *give_up_at)) {
+                logger.Error("Detector finished, but no start message arrived - abandoning measurement");
+                cancelled = true;
+                break;
+            }
             msg = image_puller.PollImage();
+        }
 
         if (cancelled) {
             current_status.SetProgress({});
@@ -399,6 +411,13 @@ void JFJochReceiverLite::DataAnalysisThread(uint32_t id) {
     logger.Debug("Thread {} finished", id);
 }
 
+void JFJochReceiverLite::Cancel(bool silent) {
+    JFJochReceiver::Cancel(silent);
+    // A silent cancel is not a request to abort - it says the detector has finished - so it must
+    // not set cancelled. It does bound the wait for the start message: see MeasurementThread.
+    detector_finished = true;
+}
+
 void JFJochReceiverLite::StopReceiver() {
     if (measurement.valid()) {
         measurement.get();
diff --git a/receiver/JFJochReceiverLite.h b/receiver/JFJochReceiverLite.h
index 1ceae6055..0a6e66df5 100644
--- a/receiver/JFJochReceiverLite.h
+++ b/receiver/JFJochReceiverLite.h
@@ -25,10 +25,24 @@
 #include "../image_analysis/dark_mask_analysis/DarkMaskAnalysis.h"
 
 class JFJochReceiverLite : public JFJochReceiver {
+    // Overriding Cancel(bool) below would otherwise hide the Cancel(const JFJochException &)
+    // the analysis threads call.
+    using JFJochReceiver::Cancel;
+
     ImagePuller &image_puller;
 
     std::atomic<bool> end_message_received{false};
 
+    // Set when the caller reports the run is over - JFJochServices::Stop cancels the receiver
+    // silently once the detector reads back idle. Only consulted while waiting for the start
+    // message; a silent cancel must not interrupt images that are still being processed.
+    std::atomic<bool> detector_finished{false};
+
+    // How long a start message may still be in flight after the detector reported it had finished.
+    // The detector can also read back as idle for a moment just after it was armed, so a run is not
+    // abandoned the instant the silent cancel arrives.
+    constexpr static auto StartMessageGrace = std::chrono::seconds(5);
+
     const int64_t data_analysis_nthreads;
 
     std::vector<std::future<void>> data_analysis_futures;
@@ -62,6 +76,7 @@ public:
     ~JFJochReceiverLite() override;
 
     void StopReceiver() override;
+    void Cancel(bool silent) override;
 
     float GetEfficiency() const override;
     float GetProgress() const override;
diff --git a/rugnux/ResultReport.cpp b/rugnux/ResultReport.cpp
index bf727e768..af0fddec6 100644
--- a/rugnux/ResultReport.cpp
+++ b/rugnux/ResultReport.cpp
@@ -34,7 +34,16 @@ namespace {
     //    whether choosing the partner reflections differently could repair it.
     // 13: CC_MODEL_* in section 5 - the correlation of the merged intensities with the placed model,
     //    by resolution shell, which only a run given a model can report.
-    constexpr int REPORT_VERSION = 7;
+    // 8: every line that is not `KEY= value` and not blank starts with `#`, warnings included
+    //    (`# WARNING:`); the header gains RUGNUX_DOWNLOAD and BUILD_CXX_FLAGS, and RUGNUX_GIT is
+    //    the full build-time hash.
+    //
+    // The entries above are the format's history; the constant counts RELEASES, not entries, and
+    // is bumped ONCE PER RELEASE BRANCH. A reader only ever meets what was built from main, so a
+    // second bump inside an rc branch numbers a format no one received. Several entries above were
+    // written on branches that shipped together, which is why there are more of them than there
+    // are versions - that is the convention working, not the constant lagging.
+    constexpr int REPORT_VERSION = 8;
 
     const char *BANNER = " ******************************************************************************";
 
@@ -182,6 +191,25 @@ namespace {
                 finest = sh.d_min;
         return finest;   // 0.0 = no shell reaches the target at all
     }
+
+    // Where CC1/2 climbs back above the cut's target after it has already fallen below it. Below the
+    // target a shell carries no signal the cut would keep, so a shell past that point which
+    // correlates again is noise correlating with noise: the curve is not a fall-off, and no single
+    // resolution can be read off it. Returns that shell's d_min, 0.0 when the curve never climbs
+    // back. A wobble that stays ABOVE the target is not this - a fall-off with a noisy shell in it
+    // is still a fall-off.
+    double CCHalfClimbsBackAboveTarget(const MergeStatistics &ms, double target) {
+        bool below = false;
+        for (const auto &sh : ms.shells) {
+            if (!std::isfinite(sh.cc_half))
+                continue;
+            if (sh.cc_half < target)
+                below = true;
+            else if (below)
+                return sh.d_min;
+        }
+        return 0.0;
+    }
 }
 
 // ---------------------------------------------------------------------------- the emitter
@@ -200,15 +228,19 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
     // ------------------------------------------------------------------ header block
     {
         ReportSection h;
-        Add(h, Prose(" What this run determined, written next to its other output. The `KEY= value` lines\n"
-                     " and the tables below are a stable interface - a script greps them, and REPORT_VERSION\n"
-                     " says when that interface last changed. --developer adds the pipeline internals and the\n"
-                     " long explanations; leaving it off relocates them, it does not lose them."));
-        Add(h, Blank());
         Add(h, KeyInt("REPORT_VERSION", REPORT_VERSION));
         Add(h, KeyText("RUGNUX_VERSION", jfjoch_version()));
+        // The release page of exactly this version; the tag on a release is the version string.
+        Add(h, KeyText("RUGNUX_DOWNLOAD",
+                       "https://gitea.psi.ch/mx/Jungfraujoch/releases/tag/" + jfjoch_version()));
+        // The commit the binary was built from - stamped at BUILD time, not configure time, and a
+        // "-dirty" suffix marks uncommitted changes - and the compiler flags it was built with.
+        // Both are provenance the version string does not carry: two builds of one commit can
+        // differ by flags alone, and -march moves the CPU-bound results.
         if (!jfjoch_git_sha1().empty())
-            Add(h, KeyText("RUGNUX_GIT", jfjoch_git_sha1().substr(0, 6) + " " + jfjoch_git_date()));
+            Add(h, KeyText("RUGNUX_GIT", jfjoch_git_sha1() + " " + jfjoch_git_date()));
+        Add(h, KeyText("BUILD_CXX_FLAGS",
+                       jfjoch_build_cxx_flags().empty() ? "NONE" : jfjoch_build_cxx_flags()));
         Add(h, KeyText("DATE", time_UTC(std::chrono::system_clock::now())));
         Add(h, KeyText("INPUT_FILE", input_file));
         Add(h, KeyText("OUTPUT_PREFIX", output_prefix));
@@ -283,8 +315,8 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
             if (medium == FlightPathMedium::Air && std::fabs(dB) >= 2.0)
                 Warn(doc, PathologyCode::FLIGHT_PATH, fmt::format(
                         "an AIR flight path was assumed, which is worth {:.1f} A^2 of Wilson B here; "
-                        "no file states the medium, so if this station used a helium cone or an "
-                        "evacuated flight tube, re-run with --flight-path helium (or vacuum)", dB));
+                        "no file states the medium, so a station with a helium cone or an evacuated "
+                        "flight tube needs a re-run with --flight-path helium (or vacuum)", dB));
         }
 
         // The same geometry once more as the object jfjoch_broker takes it in - the four required
@@ -342,8 +374,8 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                          " is the DIRECT_BEAM above and not the split between the two; what survives that alias\n"
                          " grows as the square of the scattering angle, and on a short-distance long-wavelength\n"
                          " sweep it is large enough that the fit reproduces a separately measured tilt to a few\n"
-                         " hundredths of a degree. Where 2theta is ordinary, compare the MEDIAN of this value over\n"
-                         " several crystals collected on the same detector rather than one run's: that does track\n"
+                         " hundredths of a degree. Where 2theta is ordinary, the MEDIAN of this value over\n"
+                         " several crystals collected on the same detector - not one run's - does track\n"
                          " a calibration well enough to show up a placeholder or a stale tilt in the file, and it\n"
                          " does not replace the calibration.\n"
                          " rot3 is omitted because a rotation about the beam is an exact null of this experiment\n"
@@ -444,6 +476,12 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
             Add(s, KeyText("POSTREFINE_BEAM_CENTRE",
                            fmt::format("{:.2f} {:.2f} -> {:.2f} {:.2f}", pr.beam_x_before_px,
                                        pr.beam_y_before_px, pr.beam_x_after_px, pr.beam_y_after_px)));
+            // Which test refused the fit, where one did. Every refusal leaves the same geometry - the
+            // header's - so without this the report cannot tell a fit that was thrown away from one that
+            // never wanted to move, and a refusal is the one case where the number worth reading is the
+            // one that was thrown away.
+            if (!pr.refused_reason.empty())
+                Add(s, KeyText("POSTREFINE_REFUSED", pr.refused_reason));
             Add(s, KeyReal("GONIOMETER_ROTATION_SCALE", pr.rotation_scale, "{:.5f}"));
             Add(s, KeyBool("GONIOMETER_ROTATION_SCALE_SUSPECT", pr.rotation_scale_suspect));
             if (pr.rotation_scale_suspect)
@@ -477,8 +515,9 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
             Add(s, Prose(line));
             if (enantiomorphic && !alts.empty() && alts.find('|') == std::string::npos)
                 Add(s, Prose(" The pair differs only in the hand of the screw axis, which merged intensities\n"
-                             " cannot name. Try both in molecular replacement and keep whichever refines -\n"
-                             " that is the normal outcome for a chiral group, not a failure of the run."));
+                             " cannot name. Molecular replacement settles it: one of the two refines and the\n"
+                             " other does not - the normal outcome for a chiral group, not a failure of the\n"
+                             " run."));
             if (refused)
                 Add(s, Prose(fmt::format(
                         " A promotion to {} was refused: {}.\n"
@@ -540,21 +579,29 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
             // than the finest shell that still reaches the target asserts a resolution the shell
             // table on this very page refutes.
             const double finest_supported = FinestSupportedShell(ms, cc_target);
+            const double climbs_back = CCHalfClimbsBackAboveTarget(ms, cc_target);
             std::string fit_suppressed;
             // Only where there are shells to judge the fit against; with no table there is no
             // evidence either way, and suppressing on no evidence is its own false claim.
-            if (result.resolution_fit_A && !ms.shells.empty()) {
-                if (finest_supported == 0.0)
+            if (!ms.shells.empty()) {
+                if (climbs_back > 0.0)
                     fit_suppressed = fmt::format(
-                            "CC1/2 never reaches the cut's target of {:.2f} in any shell, so there is no"
-                            " fall-off to fit", cc_target);
-                else if (*result.resolution_fit_A < finest_supported - 1e-6)
-                    fit_suppressed = fmt::format(
-                            "the fit reads {:.2f} A, finer than the finest shell whose CC1/2 still reaches"
-                            " {:.2f} ({:.2f} A), so the curve it was read off is not a fall-off",
-                            *result.resolution_fit_A, cc_target, finest_supported);
-                else
-                    fitted_resolution = *result.resolution_fit_A;
+                            "CC1/2 falls below the cut's target of {:.2f} and then climbs back above it"
+                            " at {:.2f} A, so this curve is not a fall-off and no one resolution can be"
+                            " read off it", cc_target, climbs_back);
+                else if (result.resolution_fit_A) {
+                    if (finest_supported == 0.0)
+                        fit_suppressed = fmt::format(
+                                "CC1/2 never reaches the cut's target of {:.2f} in any shell, so there is"
+                                " no fall-off to fit", cc_target);
+                    else if (*result.resolution_fit_A < finest_supported - 1e-6)
+                        fit_suppressed = fmt::format(
+                                "the fit reads {:.2f} A, finer than the finest shell whose CC1/2 still"
+                                " reaches {:.2f} ({:.2f} A), so the curve it was read off is not a"
+                                " fall-off", *result.resolution_fit_A, cc_target, finest_supported);
+                    else
+                        fitted_resolution = *result.resolution_fit_A;
+                }
             }
             if (fitted_resolution)
                 Add(s, KeyReal("FITTED_RESOLUTION", *fitted_resolution, "{:.2f}"));
@@ -678,7 +725,8 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                                       o.total_observations);
                 Warn(doc, PathologyCode::UNUSABLE_MERGE,
                      "These merged data are not usable as they stand: " + why
-                     + ". Do not refine against the written reflections without establishing why");
+                     + ". The written reflection files carry the same problem, and refinement against "
+                       "them is meaningless until the cause is established");
             }
             // Completeness measured where the signal is, not over the generous cut - so a
             // corner-limited detector on good data does not fire it and a genuinely thin dataset does.
@@ -687,12 +735,12 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                 Warn(doc, PathologyCode::LOW_COMPLETENESS, fmt::format(
                         "Only {:.1f}% of the unique reflections to {:.2f} A were measured - the merge is "
                         "missing a large part of reciprocal space, which no amount of multiplicity in what "
-                        "was measured makes up for. Collect a wider sweep, or a second one about a "
-                        "different axis", completeness_fit.percent, completeness_fit.d_min));
+                        "was measured makes up for. A wider sweep, or a second one about a different "
+                        "axis, is what fills the gap", completeness_fit.percent, completeness_fit.d_min));
             if (!fit_suppressed.empty() && !unusable_merge)
                 Warn(doc, PathologyCode::RESOLUTION_FIT,
                      "No resolution could be fitted: " + fit_suppressed
-                     + ". Read the shell table rather than quoting a single number");
+                     + ". The shell table, not a single number, says where the signal stops");
         }
         doc.sections.push_back(std::move(s));
     }
@@ -740,6 +788,45 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
             }
         }
 
+        // ---- powder contamination
+        // A crystalline phase other than the crystal, diffracting as rings among its reflections.
+        // Measured in the pre-scan on every run, from the spots found there for the width and the
+        // beam centre, and reported whatever it says - a user whose crystal sat in a powder should
+        // be told so whether or not it cost this run anything. Only hexagonal ice has rings that can
+        // be named in advance; POWDER_RINGS_A is what THIS sample showed.
+        {
+            const auto &pw = result.powder;
+            Add(s, KeyEnum("POWDER_RINGS_DETECTED", pw.rings_q_recipA.empty() ? "FALSE" : "TRUE",
+                           {"TRUE", "FALSE"}));
+            if (!pw.rings_q_recipA.empty()) {
+                Add(s, KeyInt("POWDER_RING_COUNT", static_cast<int64_t>(pw.rings_q_recipA.size())));
+                Add(s, KeyReal("POWDER_SPOT_FRACTION", pw.spot_fraction, "{:.3f}"));
+                if (pw.resolved_to_d_A)
+                    Add(s, KeyReal("POWDER_RINGS_SEPARABLE_TO", *pw.resolved_to_d_A, "{:.2f}"));
+                std::string ds;
+                for (const float q : pw.rings_q_recipA)
+                    ds += fmt::format("{}{:.3f}", ds.empty() ? "" : " ", 6.283185307f / q);
+                Add(s, KeyText("POWDER_RINGS_A", ds));
+                Add(s, KeyEnum("POWDER_EXCLUDED_FROM_INDEXING",
+                               result.powder_excluded_from_indexing ? "TRUE" : "FALSE",
+                               {"TRUE", "FALSE"}));
+                if (result.powder_indexing_d_min_A)
+                    Add(s, KeyReal("POWDER_INDEXING_D_MIN", *result.powder_indexing_d_min_A, "{:.2f}"));
+                Add(s, Blank());
+                Add(s, Prose(fmt::format(
+                        " Powder contamination: {} rings, holding {:.0f}% of the spots the pre-scan found\n"
+                        " above the smooth fall-off of spot density. That is a crystalline phase other than\n"
+                        " this crystal - hexagonal ice, a shower of microcrystals, a salt out of the\n"
+                        " cryoprotectant - and its reflections are recorded and integrated alongside the\n"
+                        " crystal's own. {}",
+                        pw.rings_q_recipA.size(), 100.0f * pw.spot_fraction,
+                        result.powder_excluded_from_indexing
+                            ? "They were left out of indexing on this run."
+                            : "Indexing did not need them left out, so nothing was excluded for them.")));
+            }
+            Add(s, Blank());
+        }
+
         // ---- translational pseudo-symmetry
         // Printed immediately before the twinning block, and in the same section, because the two
         // interact: a pseudo-translation that is not a half-integer vector biases <|L|> upwards and
@@ -797,9 +884,9 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                     Add(s, Prose(fmt::format(
                             " Translational pseudo-symmetry: INDICATED. The native Patterson has an off-origin peak\n"
                             " at {:.1f}% of the origin at ({:.3f}, {:.3f}, {:.3f}), {:.1f} A, and the intensities\n"
-                            " modulate {:.1f}x along that vector. Declare it to the molecular-replacement program:\n"
-                            " the modulation is not in the search model, and without it the search can fail on data\n"
-                            " that are otherwise good.",
+                            " modulate {:.1f}x along that vector. The molecular-replacement program needs the vector\n"
+                            " declared: the modulation is not in the search model, and without it the search can\n"
+                            " fail on data that are otherwise good.",
                             t.peak_percent, t.vector_frac[0], t.vector_frac[1], t.vector_frac[2],
                             t.vector_length_A, t.modulation)));
                 else if (t.modulation_measured)
@@ -819,8 +906,8 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                     Add(s, ProseDefaultOnly(
                             "\n The class this translation suppresses is not weak but very nearly EXTINCT, which is what\n"
                             " a lattice translation of a smaller cell looks like when it is measured in a larger one.\n"
-                            " Treat the reported cell as a supercell candidate rather than a settled result: a cell\n"
-                            " with this translation as a lattice vector is the rival to check."));
+                            " The reported cell is therefore a supercell candidate rather than a settled result,\n"
+                            " and the rival hypothesis is a cell with this translation as a lattice vector."));
 
                 if (!t.undeclared_lattice_translations.empty()) {
                     const auto &v = t.undeclared_lattice_translations.front();
@@ -845,8 +932,8 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                 if (t.detected)
                     Warn(doc, PathologyCode::PSEUDO_TRANSLATION, fmt::format(
                             "Translational pseudo-symmetry: Patterson off-origin peak {:.1f}% of the origin at "
-                            "({:.3f}, {:.3f}, {:.3f}), {:.1f} A - declare it to the molecular-replacement program, "
-                            "which will otherwise be searching against a modulation it does not model",
+                            "({:.3f}, {:.3f}, {:.3f}), {:.1f} A - the molecular-replacement program needs the "
+                            "vector declared, or it will be searching against a modulation it does not model",
                             t.peak_percent, t.vector_frac[0], t.vector_frac[1], t.vector_frac[2],
                             t.vector_length_A));
                 if (!t.undeclared_lattice_translations.empty())
@@ -860,7 +947,7 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                 if (t.detected && t.near_extinct_class)
                     Warn(doc, PathologyCode::LATTICE_TRANSLATION, fmt::format(
                             "The pseudo-translation at {:.1f} A suppresses its phase class almost completely, so the "
-                            "reported cell may be a supercell - check the indexing before treating the cell as settled",
+                            "reported cell may be a supercell - it is not settled until the indexing has been re-examined",
                             t.vector_length_A));
             }
         }
@@ -900,7 +987,8 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                 Add(s, Prose(fmt::format(
                         " Twinning: INDICATED. <|L|> is {:.3f}, where an untwinned crystal reads about 0.5 and\n"
                         " a perfect twin about 0.375. The estimated fraction {:.2f} is derived from the second\n"
-                        " moment alone and the L-test may imply a larger one. Refine with a twin law.",
+                        " moment alone and the L-test may imply a larger one. Refinement against these data\n"
+                        " needs a twin law.",
                         tw.mean_abs_l, tw.estimated_twin_fraction)));
             else if (tw.l_test_contaminated_by_tncs)
                 // <|L|> is the number this sentence would otherwise rest on, and on this crystal it is
@@ -923,11 +1011,13 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                              " above are computed in the Laue class this run ADOPTED, so if the search promoted the\n"
                              " point group they can only report that no twin law exists inside the class it chose -\n"
                              " and a twin is precisely what would have caused that promotion. Where the two pairs\n"
-                             " disagree, believe the _BEFORE_SEARCH one about whether the crystal is twinned.", true));
+                             " disagree, the _BEFORE_SEARCH pair is the one that answers whether the crystal is\n"
+                             " twinned.", true));
             if (tw.twinning_suspected)
                 Warn(doc, PathologyCode::TWINNING, fmt::format(
                         "Twinning is indicated (<|L|> = {:.3f}, <I^2>/<I>^2 = {:.3f}, estimated twin "
-                        "fraction {:.2f} from the second moment) - refine against the merged data with care",
+                        "fraction {:.2f} from the second moment) - refinement against the merged data "
+                        "needs a twin law",
                         tw.mean_abs_l, tw.second_moment, tw.estimated_twin_fraction));
         }
 
@@ -946,7 +1036,7 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
             Add(s, Blank());
             if (std::isfinite(db))
                 Add(s, Prose(fmt::format(
-                        " Radiation damage: the relative B rises by {:.2f} A^2 over the sweep{}.",
+                        " Radiation damage: the relative B changes by {:+.2f} A^2 over the sweep{}.",
                         db, db < 2.0 ? ", which is negligible" : "")));
             Add(s, Prose("\n" + result.radiation_damage_text, true));
         }
@@ -954,23 +1044,54 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
         // ---- sweep quality
         {
             const auto &sq = result.merge_statistics.sweep_quality;
+            const int n_sweep_frames = sq.frames_merged + sq.frames_downgraded + sq.frames_rejected;
+            auto pct = [&](int n) { return n_sweep_frames > 0 ? 100.0 * n / n_sweep_frames : 0.0; };
+            // A delta-CC1/2 or its standard error that could not be measured prints as a dash - a
+            // range too thin to judge is not a range that was judged and came out at zero.
+            auto cc_cell = [](float v) {
+                return std::isfinite(v) ? fmt::format("{:+.4f}", v) : std::string("-");
+            };
+            auto se_cell = [](float v) {
+                return std::isfinite(v) ? fmt::format("{:.4f}", v) : std::string("-");
+            };
             Add(s, KeyInt("SWEEP_QUALITY_COUNT", static_cast<int64_t>(sq.ranges.size())));
             Add(s, KeyEnum("SWEEP_QUALITY_STATUS", sq.measured ? "COMPUTED" : "NOT_COMPUTED",
                            {"COMPUTED", "NOT_COMPUTED"}, true));
             {
                 std::string codes;
-                for (int r = 0; r <= static_cast<int>(SweepQualityReason::RadiationDamage); ++r)
+                for (int r = 0; r <= static_cast<int>(SweepQualityReason::InconsistentWithMerge); ++r)
                     codes += (codes.empty() ? "" : " ")
                              + std::string(SweepQualityReasonCode(static_cast<SweepQualityReason>(r)));
                 Add(s, KeyText("SWEEP_QUALITY_REASONS", codes, true));
+                std::string dispositions;
+                for (int d = 0; d <= static_cast<int>(FrameDisposition::Rejected); ++d)
+                    dispositions += (dispositions.empty() ? "" : " ")
+                                    + std::string(FrameDispositionCode(static_cast<FrameDisposition>(d)));
+                Add(s, KeyText("SWEEP_DISPOSITIONS", dispositions, true));
             }
             if (sq.measured) {
+                Add(s, KeyInt("FRAMES_MERGED", sq.frames_merged));
+                Add(s, KeyInt("FRAMES_DOWNGRADED", sq.frames_downgraded));
+                Add(s, KeyInt("FRAMES_REJECTED", sq.frames_rejected));
+                Add(s, KeyReal("FRAMES_REJECTED_PCT", pct(sq.frames_rejected), "{:.2f}"));
+                Add(s, KeyReal("ROTATION_REJECTED_DEG", sq.rejected_deg, "{:.1f}"));
                 Add(s, KeyReal("SWEEP_ROTATION", sq.sweep_deg, "{:.1f}", true));
                 Add(s, KeyReal("FLUX_PEAK_TO_TROUGH", sq.flux_peak_to_trough, "{:.2f}", true));
                 Add(s, KeyReal("SCALE_MODULATION_PEAK_TO_TROUGH", sq.modulation_peak_to_trough,
                                "{:.2f}", true));
             }
             Add(s, Blank());
+            if (sq.measured)
+                // Frames AND degrees, because a percentage of frames can be moved by re-slicing the
+                // same experiment - 5% of 0.05 deg frames is not 5% of the experiment - and a percentage
+                // of the rotation cannot.
+                Add(s, Prose(fmt::format(
+                        " Sweep: {} frames / {:.1f} deg; {} merged ({:.1f}%), {} downgraded ({:.1f}%),\n"
+                        " {} rejected ({:.1f}% of frames, {:.1f} deg).",
+                        n_sweep_frames, sq.sweep_deg,
+                        sq.frames_merged, pct(sq.frames_merged),
+                        sq.frames_downgraded, pct(sq.frames_downgraded),
+                        sq.frames_rejected, pct(sq.frames_rejected), sq.rejected_deg)));
             if (sq.ranges.empty()) {
                 // The empty table used to print its header and two rules around nothing on every
                 // clean run - a table that says "no problem" by being blank.
@@ -982,20 +1103,30 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                 Add(s, Prose(" Stretches of the sweep over which the crystal delivered much less than the rest of\n"
                              " the run. SEVERITY is the fraction of the run's typical diffracting power missing over\n"
                              " the range; SCALE and CC are relative to the run median; INDEXED is the fraction of the\n"
-                             " range's frames that were scaled at all. Nothing is excluded on the strength of this.\n"));
+                             " range's frames that were scaled at all. DELTA_CC_HALF is what keeping the range costs\n"
+                             " the merged intensities - the overall CC1/2 with it minus the CC1/2 without it, over the\n"
+                             " reflections it touches - beside the standard error of a CC1/2 on that many reflections.\n"
+                             " A range is REJECTED only where that cost puts it well below the rest of this run's own\n"
+                             " batches, is several standard errors below zero, AND every one of its frames is one the\n"
+                             " SCALE and CC channels call worse than a typical frame of the run; everything else is\n"
+                             " DOWNGRADED, which means it stays in the merge at the reduced weight its own scale and\n"
+                             " sigmas give it. Weak but consistent data belong in the merge.\n"));
                 ReportEntry e;
                 e.kind = ReportEntry::Kind::Table;
                 e.table.columns = {"FIRST_IMAGE", "LAST_IMAGE", "N_IMAGES", "ROTATION", "REASON",
-                                   "SEVERITY", "SCALE", "CC", "INDEXED"};
+                                   "SEVERITY", "SCALE", "CC", "INDEXED", "DISPOSITION",
+                                   "DELTA_CC_HALF", "DELTA_CC_HALF_SE"};
                 e.table.text_header =
-                        "  FIRST_IMAGE   LAST_IMAGE   N_IMAGES  ROTATION  REASON                SEVERITY   SCALE      CC   INDEXED\n"
-                        "  -----------  -----------  ---------  --------  --------------------  --------  ------  ------  --------";
+                        "  FIRST_IMAGE   LAST_IMAGE   N_IMAGES  ROTATION  REASON                SEVERITY   SCALE      CC   INDEXED  DISPOSITION  DELTA_CC_HALF  DELTA_CC_HALF_SE\n"
+                        "  -----------  -----------  ---------  --------  --------------------  --------  ------  ------  --------  -----------  -------------  ----------------";
                 for (const auto &r : sq.ranges) {
                     e.table.text_rows.push_back(fmt::format(
-                            "  {:11d}  {:11d}  {:9d}  {:8.1f}  {:<20}  {:8.2f}  {:6.2f}  {:6.2f}  {:8.2f}",
+                            "  {:11d}  {:11d}  {:9d}  {:8.1f}  {:<20}  {:8.2f}  {:6.2f}  {:6.2f}  {:8.2f}  {:<11}  {:>13}  {:>16}",
                             r.first_image, r.last_image, r.last_image - r.first_image + 1,
                             r.rotation_deg, SweepQualityReasonCode(r.reason), r.severity,
-                            r.mean_relative_scale, r.mean_relative_cc, r.indexed_fraction));
+                            r.mean_relative_scale, r.mean_relative_cc, r.indexed_fraction,
+                            FrameDispositionCode(r.disposition), cc_cell(r.delta_cc_half),
+                            se_cell(r.delta_cc_half_se)));
                     std::vector<ReportValue> row;
                     row.push_back(KeyInt("", r.first_image).value);
                     row.push_back(KeyInt("", r.last_image).value);
@@ -1006,12 +1137,29 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                     row.push_back(KeyReal("", r.mean_relative_scale, "{:.2f}").value);
                     row.push_back(KeyReal("", r.mean_relative_cc, "{:.2f}").value);
                     row.push_back(KeyReal("", r.indexed_fraction, "{:.2f}").value);
+                    row.push_back(KeyText("", FrameDispositionCode(r.disposition)).value);
+                    row.push_back(KeyText("", cc_cell(r.delta_cc_half)).value);
+                    row.push_back(KeyText("", se_cell(r.delta_cc_half_se)).value);
                     e.table.cells.push_back(std::move(row));
+                    const bool rejected = r.disposition == FrameDisposition::Rejected;
+                    std::string cost;
+                    if (!std::isfinite(r.delta_cc_half))
+                        cost = rejected ? " - REJECTED"
+                                        : " - kept at their own reduced weight; too few reflections to "
+                                          "measure what they cost";
+                    else if (rejected)
+                        cost = fmt::format(" - REJECTED: keeping them lowered CC1/2 by {:.4f} +/- {:.4f} "
+                                           "over the reflections they touch",
+                                           -r.delta_cc_half, r.delta_cc_half_se);
+                    else
+                        cost = fmt::format(" - kept at their own reduced weight; removing them would change "
+                                           "CC1/2 by {:+.4f} +/- {:.4f} over the reflections they touch",
+                                           -r.delta_cc_half, r.delta_cc_half_se);
                     Warn(doc, PathologyCode::SWEEP_GAPS, fmt::format(
-                            "Frames {}-{} {} ({:.1f} deg, scale {:.2f} and CC {:.2f} of the run, {:.0f}% scaled)",
+                            "Frames {}-{} {} ({:.1f} deg, scale {:.2f} and CC {:.2f} of the run, {:.0f}% scaled){}",
                             r.first_image, r.last_image, SweepQualityReasonText(r.reason),
                             r.rotation_deg, r.mean_relative_scale, r.mean_relative_cc,
-                            100.0 * r.indexed_fraction));
+                            100.0 * r.indexed_fraction, cost));
                 }
                 Add(s, std::move(e));
             }
@@ -1041,10 +1189,18 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
             Add(s, KeyEnum("ANISOTROPY_VERDICT", AnisotropyVerdictCode(an.verdict),
                            {"DETECTED", "NOT_DETECTED", "CANNOT_DETERMINE"}));
             Add(s, KeyReal("ANISOTROPY_DELTA_B", an.delta_b, "{:.2f}"));
-            Add(s, KeyText("ANISOTROPY_D_MIN_PRINCIPAL",
-                           fmt::format("{:.2f} {:.2f} {:.2f}", an.d_min_axis[0], an.d_min_axis[1],
-                                       an.d_min_axis[2])));
-            Add(s, KeyReal("ANISOTROPY_D_MIN_SPREAD", an.d_min_spread, "{:.2f}"));
+            // The one rule again: a direction the fit could not limit prints "-", and a triplet
+            // with no measured direction at all writes no key - never the word "nan".
+            if (std::isfinite(an.d_min_axis[0]) || std::isfinite(an.d_min_axis[1])
+                || std::isfinite(an.d_min_axis[2])) {
+                std::string principal;
+                for (int i = 0; i < 3; ++i)
+                    principal += (i ? " " : "") + (std::isfinite(an.d_min_axis[i])
+                            ? fmt::format("{:.2f}", an.d_min_axis[i]) : std::string("-"));
+                Add(s, KeyText("ANISOTROPY_D_MIN_PRINCIPAL", principal));
+            }
+            if (std::isfinite(an.d_min_spread))
+                Add(s, KeyReal("ANISOTROPY_D_MIN_SPREAD", an.d_min_spread, "{:.2f}"));
 
             // The gate's internals. Correct, and none of it changes what a user does next; the verdict
             // key above already carries the decision they were computed to make.
@@ -1160,27 +1316,6 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                             "interpretation should allow for it; no intensity has been corrected for it here",
                             an.delta_b));
             }
-
-            // CC1/2 that falls and then climbs again is not a fall-off. An observation about the
-            // resolution cut's own internals, which no user can act on: it belongs in the developer
-            // report, because a warning nobody can act on teaches people to skip the section.
-            {
-                // A climb only counts while the shell still carries signal: past CC1/2 ~ 0.3 the data
-                // are beyond any cut this run would take and the number is oscillating in noise.
-                constexpr double CC_HALF_RISE = 0.05, CC_HALF_ALIVE = 0.30;
-                const auto &sh = result.merge_statistics.shells;
-                size_t fell = 0, rose_after = 0;
-                for (size_t i = 1; i < sh.size(); ++i) {
-                    if (sh[i].cc_half < sh[i - 1].cc_half) fell = i;
-                    else if (fell > 0 && sh[i].cc_half > sh[i - 1].cc_half + CC_HALF_RISE
-                             && sh[i].cc_half > CC_HALF_ALIVE) rose_after = i;
-                }
-                if (rose_after > 0)
-                    Warn(doc, PathologyCode::RESOLUTION_FIT, fmt::format(
-                            "CC1/2 is not monotone with resolution (it climbs again at {:.2f}-{:.2f} A) - the "
-                            "fall-off the resolution cut is read off does not describe these data",
-                            sh[rose_after].d_max, sh[rose_after].d_min), true);
-            }
         }
         doc.sections.push_back(std::move(s));
     }
@@ -1303,9 +1438,9 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                 }
                 Add(s, std::move(e));
                 Add(s, Prose("\n"
-                             " Read it in ONE direction only. A shell whose correlation is significantly above zero\n"
-                             " carries signal, because a model cannot agree by accident with measurements it was\n"
-                             " never fitted to, so CC_MODEL_CONFIRMED_TO_D_MIN is a lower bound on the useful\n"
+                             " The table reads in ONE direction only. A shell whose correlation is significantly\n"
+                             " above zero carries signal, because a model cannot agree by accident with measurements\n"
+                             " it was never fitted to, so CC_MODEL_CONFIRMED_TO_D_MIN is a lower bound on the useful\n"
                              " resolution and an argument for keeping MORE data. A shell whose correlation is near\n"
                              " zero says nothing about the data: the model may be incomplete, in the wrong hand or\n"
                              " simply wrong for this crystal, and cutting data on it would be cutting because the\n"
@@ -1414,14 +1549,16 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                 doc.verdict_text += fmt::format(" (or {}, which these data cannot separate from it)", alt);
             doc.verdict_text += ".";
             if (unusable_merge)
-                doc.verdict_text += " The merged data carry no usable signal - see the warnings before"
-                                    " using any of the written files.";
+                doc.verdict_text += " The merged data carry no usable signal - the warnings say why,"
+                                    " and the written files carry the same problem.";
             else if (!doc.pathology_flags.empty()) {
                 std::string f;
                 for (const auto &c : doc.pathology_flags)
                     f += (f.empty() ? "" : ", ") + c;
-                doc.verdict_text += fmt::format(" {} condition(s) need attention: {}.",
-                                                doc.pathology_flags.size(), f);
+                doc.verdict_text += fmt::format(" {} condition{} attention: {}.",
+                                                doc.pathology_flags.size(),
+                                                doc.pathology_flags.size() == 1 ? " needs" : "s need",
+                                                f);
             } else {
                 doc.verdict_text += " No warnings.";
             }
@@ -1507,11 +1644,17 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
                 if (std::isfinite(db))
                     row("Radiation damage", fmt::format("relative B {:+.2f} A^2 over the sweep", db));
                 const auto &sq = result.merge_statistics.sweep_quality;
-                if (sq.measured)
-                    row("Sweep", sq.ranges.empty()
-                            ? fmt::format("no degraded ranges in {:.1f} deg", sq.sweep_deg)
-                            : fmt::format("{} degraded range(s) in {:.1f} deg", sq.ranges.size(),
-                                          sq.sweep_deg));
+                if (sq.measured) {
+                    const int n_sweep = sq.frames_merged + sq.frames_downgraded + sq.frames_rejected;
+                    row("Sweep", sq.frames_rejected > 0
+                            ? fmt::format("{} of {} frames rejected ({:.1f} deg of {:.1f}), "
+                                          "{} degraded range(s)", sq.frames_rejected, n_sweep,
+                                          sq.rejected_deg, sq.sweep_deg, sq.ranges.size())
+                            : (sq.ranges.empty()
+                                   ? fmt::format("no degraded ranges in {:.1f} deg", sq.sweep_deg)
+                                   : fmt::format("{} degraded range(s) in {:.1f} deg, none rejected",
+                                                 sq.ranges.size(), sq.sweep_deg)));
+                }
             }
             if (!f.empty()) {
                 f.pop_back();
@@ -1540,7 +1683,35 @@ ReportDocument BuildReportDocument(const std::string &output_prefix,
 // text file looks, which is what makes a second rendering a second function rather than a fork.
 std::string RenderReportText(const ReportDocument &doc, bool developer) {
     std::ostringstream os;
-    os << BANNER << "\n  RUGNUX PROCESSING REPORT\n" << BANNER << "\n\n";
+    // Everything that is not a `KEY= value` line and not blank is written as a `#` comment, so a
+    // consumer that drops the `#` lines is left with the data alone. Applied here, on whole
+    // rendered blocks, so no emitter can forget it.
+    const auto comment = [&os](const std::string &text) {
+        size_t start = 0;
+        while (true) {
+            const size_t end = text.find('\n', start);
+            const std::string line = text.substr(
+                    start, end == std::string::npos ? std::string::npos : end - start);
+            if (line.empty())
+                os << "\n";
+            else
+                os << (line[0] == ' ' ? "#" : "# ") << line << "\n";
+            if (end == std::string::npos)
+                break;
+            start = end + 1;
+        }
+    };
+    comment(BANNER);
+    comment("  RUGNUX PROCESSING REPORT");
+    comment(BANNER);
+    os << "\n";
+    // Authorship, licence and the acknowledgement open the report rather than close it: a reader
+    // who stops after the first screen has still seen who wrote this, what they may do with it,
+    // and whose methods it implements.
+    comment(RUGNUX_AUTHORSHIP);
+    os << "\n";
+    comment(RUGNUX_ACKNOWLEDGEMENT);
+    os << "\n";
 
     for (const auto &section : doc.sections) {
         if (section.developer_only && !developer)
@@ -1552,8 +1723,13 @@ std::string RenderReportText(const ReportDocument &doc, bool developer) {
                                      });
         if (!any)
             continue;
-        if (!section.title.empty())
-            os << "\n" << BANNER << "\n  " << section.title << "\n" << BANNER << "\n\n";
+        if (!section.title.empty()) {
+            os << "\n";
+            comment(BANNER);
+            comment("  " + section.title);
+            comment(BANNER);
+            os << "\n";
+        }
 
         for (const auto &e : section.entries) {
             if ((e.developer_only && !developer) || (e.default_only && developer))
@@ -1563,15 +1739,15 @@ std::string RenderReportText(const ReportDocument &doc, bool developer) {
                     os << e.key << "= " << e.value.text << "\n";
                     break;
                 case ReportEntry::Kind::Prose:
-                    os << e.prose << "\n";
+                    comment(e.prose);
                     break;
                 case ReportEntry::Kind::Blank:
                     os << "\n";
                     break;
                 case ReportEntry::Kind::Table:
-                    os << e.table.text_header << "\n";
+                    comment(e.table.text_header);
                     for (const auto &r : e.table.text_rows)
-                        os << r << "\n";
+                        comment(r);
                     break;
             }
         }
@@ -1583,16 +1759,18 @@ std::string RenderReportText(const ReportDocument &doc, bool developer) {
             for (const auto &w : doc.warnings) {
                 if (w.developer_only && !developer)
                     continue;
-                os << "WARNING: " << w.text << "\n";
+                comment("WARNING: " + w.text);
                 ++shown;
             }
             if (shown == 0)
-                os << " (none)\n";
+                comment(" (none)");
         }
     }
 
-    os << "\n" << RUGNUX_ACKNOWLEDGEMENT << "\n";
-    os << "\n" << BANNER << "\n  END OF REPORT\n" << BANNER << "\n";
+    os << "\n";
+    comment(BANNER);
+    comment("  END OF REPORT");
+    comment(BANNER);
     return os.str();
 }
 
diff --git a/rugnux/ResultReport.h b/rugnux/ResultReport.h
index 220f8400a..9913677c5 100644
--- a/rugnux/ResultReport.h
+++ b/rugnux/ResultReport.h
@@ -34,7 +34,18 @@ struct RunProvenance {
     bool developer = false;
 };
 
-// The acknowledgement, printed by the CLI at startup and written at the foot of every report, so a
+// Authorship, licence and terms of use, written at the head of every report. The facts are the
+// repository's: the copyright headers name the author, LICENSE is GPLv3, and the sentence about
+// academic and commercial use restates what that licence already grants - said here because a
+// report travels to readers who will never open a licence file.
+inline constexpr const char *RUGNUX_AUTHORSHIP =
+        "rugnux is written by Filip Leonarski at the Paul Scherrer Institute.\n"
+        "Copyright (C) 2019-2026 Paul Scherrer Institute. It is free software under the\n"
+        "GNU General Public License v3 (see the LICENSE file): academic institutions and\n"
+        "commercial companies alike are free to use it.\n"
+        "Releases: https://gitea.psi.ch/mx/Jungfraujoch/releases";
+
+// The acknowledgement, printed by the CLI at startup and at the head of every report, so a
 // result carries it wherever it travels. The methods are the field's, not this program's, and the
 // program stands on other people's open-source code; the files named here are installed beside the
 // binary (share/doc/jfjoch_rugnux on Linux, next to rugnux.exe in the Windows archive).
diff --git a/rugnux/Rugnux.cpp b/rugnux/Rugnux.cpp
index 0ac770c0a..4b20006a0 100644
--- a/rugnux/Rugnux.cpp
+++ b/rugnux/Rugnux.cpp
@@ -37,11 +37,13 @@
 #include "../image_analysis/IndexAndRefine.h"
 #include "../image_analysis/indexing/AnalyzeIndexing.h"
 #include "../image_analysis/indexing/HarmonicContamination.h"
+#include "../image_analysis/geom_refinement/BeamCenterFFT.h"
 #include "../image_analysis/geom_refinement/BeamCenterFromBackground.h"
 #include "../image_analysis/geom_refinement/BeamCenterFromSpots.h"
 #include "../image_analysis/geom_refinement/GeometryRefiner.h"
 #include "../image_analysis/indexing/IndexerThreadPool.h"
 #include "../image_analysis/spot_finding/ImageSpotFinderCPU.h"
+#include "../image_analysis/spot_finding/SpotUtils.h"
 #include "gemmi/twin.hpp"
 #include "../image_analysis/azint/AzIntEngineCPU.h"
 #include "../image_analysis/image_preprocessing/ImagePreprocessorCPU.h"
@@ -883,7 +885,8 @@ void Rugnux::PreScan(int start_image, int images_to_process, int frame_count, Ru
     // finish in.
     const auto find_spots = [&](PreScanWorker &w, CompressedImage &image, int image_idx,
                                 bool for_beam_center, std::vector<BeamCenterSpot> &out,
-                                bool for_width, std::vector<spot_width::FluxCurve> &curves) {
+                                bool for_width, std::vector<spot_width::FluxCurve> &curves,
+                                std::vector<float> &spot_q) {
         try {
             w.preprocessor->Analyze(*w.preprocessed,
                                     image.GetUncompressedPtr(w.decompression_buffer), image.GetMode());
@@ -893,6 +896,18 @@ void Rugnux::PreScan(int start_image, int images_to_process, int frame_count, Ru
             return;
         }
         auto spots = w.spot_finder->Run(*w.preprocessed, config_.spot_finding);
+        // Every frame's WHOLE spot list feeds the powder measurement below - the rings are a property
+        // of the sample, and the frames read here are already spread over the sweep, which is what
+        // sharpens them against the crystal's own rows.
+        {
+            const auto &g = experiment_.GetDiffractionGeometry();
+            for (const auto &spot : spots) {
+                const Coord c = spot.RawCoord();
+                const float d = g.PxlToRes(c.x, c.y);
+                if (d > 0.0f && std::isfinite(d))
+                    spot_q.push_back(2 * PI / d);
+            }
+        }
         // The width goes first: it wants the whole spot list, to know which spots are isolated.
         if (for_width)
             MeasureSpotFluxCurves(*w.preprocessed, static_cast<int>(experiment_.GetXPixelsNumConv()),
@@ -915,6 +930,7 @@ void Rugnux::PreScan(int start_image, int images_to_process, int frame_count, Ru
     };
 
     std::vector<float> frame_angle_deg;
+    std::vector<float> prescan_spot_q;
     std::vector<BeamCenterSpot> beam_center_spots;
     std::vector<spot_width::FluxCurve> width_curves;
     // Images the width ended up being measured on, for the log: the tiers below stop as soon as the
@@ -934,6 +950,7 @@ void Rugnux::PreScan(int start_image, int images_to_process, int frame_count, Ru
         const std::vector<int> ordinals(sample.begin(), sample.end());
         std::vector<std::vector<BeamCenterSpot>> spots_of(ordinals.size());
         std::vector<std::vector<spot_width::FluxCurve>> curves_of(ordinals.size());
+        std::vector<std::vector<float>> spot_q_of(ordinals.size());
         // A frame joins the pool only if it could be read, as it did when this was a serial loop.
         std::vector<char> spot_read(ordinals.size(), 0);
         const size_t nworkers = std::min<size_t>(std::max<size_t>(config_.nthreads, 1),
@@ -1023,7 +1040,7 @@ void Rugnux::PreScan(int start_image, int images_to_process, int frame_count, Ru
                         if (for_beam_center) spot_read[i] = 1;
                         if (for_beam_center || for_width)
                             find_spots(w, msg.image, image_idx, for_beam_center, spots_of[i],
-                                       for_width, curves_of[i]);
+                                       for_width, curves_of[i], spot_q_of[i]);
                     }
                 }));
             for (auto &f : futures) f.get();
@@ -1045,6 +1062,9 @@ void Rugnux::PreScan(int start_image, int images_to_process, int frame_count, Ru
             previous_r80 = r80;
         }
 
+        for (const auto &q : spot_q_of)
+            prescan_spot_q.insert(prescan_spot_q.end(), q.begin(), q.end());
+
         // Frame numbering follows the sample order, exactly as the serial read did.
         for (size_t i = 0; i < ordinals.size(); i++) {
             if (!spot_read[i]) continue;
@@ -1099,33 +1119,87 @@ void Rugnux::PreScan(int start_image, int images_to_process, int frame_count, Ru
         }
     }
 
+    // Powder contamination, measured on every run that finds spots here. A crystalline phase other
+    // than the crystal - hexagonal ice, a shower of microcrystals, salt out of the cryoprotectant -
+    // diffracts as rings, and its spots are handed to the indexer and to scaling as if they were this
+    // crystal's. Only ice can be named in advance; the rest has to be measured, and measuring it costs
+    // nothing here, the spots having been found for the width and the centre already.
+    //
+    // Reported on every run whatever it says. What is DONE about it is decided later and on evidence:
+    // a first pass that fails indexes again with the rings set aside and keeps whichever answer indexes
+    // more frames (see RunPipeline). This line is the diagnostic, and it is the one that tells a user
+    // their crystal was in a powder.
+    {
+        const float w = config_.spot_finding.ice_ring_width_Q_recipA;
+        powder_ = MeasurePowderRings(prescan_spot_q, w);
+        prescan_spot_quantile_d_A_.clear();
+        for (const float frac : {0.25f, 0.5f})
+            if (const auto d = SpotResolutionQuantile(prescan_spot_q, frac))
+                prescan_spot_quantile_d_A_.push_back(*d);
+        if (!powder_.rings_q_recipA.empty()) {
+            logger.Info("Powder rings: {} rings over {} pooled spots hold {:.0f}% of them above the "
+                        "smooth spot density - the coarsest at {:.2f} A, the finest at {:.2f} A{}",
+                        powder_.rings_q_recipA.size(), prescan_spot_q.size(),
+                        100.0f * powder_.spot_fraction,
+                        2 * PI / powder_.rings_q_recipA.front(),
+                        2 * PI / powder_.rings_q_recipA.back(),
+                        powder_.resolved_to_d_A
+                            ? fmt::format("; past {:.2f} A the rings have merged and cannot be told "
+                                          "from the crystal", *powder_.resolved_to_d_A)
+                            : std::string());
+        }
+    }
+
     if (frames_read.load() == 0) {
         logger.Warning("Pre-scan: no image could be read. Skipping.");
         return;
     }
 
     if (want_shadow) {
+        // Every pixel is compared against the ring it sits on, so the rings have to be drawn about
+        // the beam. A centre far enough out draws them across the background's own radial fall-off
+        // instead of along it, and what comes back describes the fall-off rather than the hardware:
+        // displacing a centre by 50 px on a clean sweep leaves the mask where it was, by 150 px
+        // masks a tenth of the detector. A centre in a file can be that wrong - one sweep here
+        // states one 351 px from where the data put it - so the rings are drawn about the centre
+        // this same projection measures rather than the one the file claims. That fit costs no
+        // frame of its own, and an unmasked shadow biases it by a few pixels at most, which is
+        // three orders below what this comparison would notice. The centre the run reports and
+        // consumes is the one fitted below instead, with the shadow out of the way.
+        if (const auto ring_center = FindBeamCenterFromBackground(experiment_, pixel_mask_,
+                                                                  finder.GetMeanProjection())) {
+            finder.BeamCenter(ring_center->beam_x_pxl, ring_center->beam_y_pxl);
+            logger.Info("Beam stop: comparing each pixel against its ring about the measured "
+                        "centre ({:.2f},{:.2f}) +- {:.2f} px, {:.2f} px from the file's",
+                        ring_center->beam_x_pxl, ring_center->beam_y_pxl, ring_center->sigma_pxl,
+                        std::hypot(ring_center->beam_x_pxl - experiment_.GetBeamX_pxl(),
+                                   ring_center->beam_y_pxl - experiment_.GetBeamY_pxl()));
+        } else {
+            logger.Info("Beam stop: the background does not place a centre on this run, so the "
+                        "rings are drawn about the file's ({:.2f},{:.2f})",
+                        experiment_.GetBeamX_pxl(), experiment_.GetBeamY_pxl());
+        }
         const auto shadow = finder.GetMask(config_.nthreads);
         const auto shadowed = std::count(shadow.begin(), shadow.end(), 1u);
         pixel_mask_.LoadBeamStopMask(experiment_, shadow);
-        // Not "this beamline has no beam stop". The search floods outwards from seeds within 4 px of
-        // the ASSUMED beam centre, so a centre far enough out puts every seed in a module gap and the
-        // flood finds nothing - which makes an empty shadow a statement about the centre. It is the
-        // sharpest free predicate there is: over 29 non-SLS datasets it fires on 3, all 3 of which had
-        // a bad outcome, with no false alarm in 39 in-house sweeps (which report 0.44-1.51 % masked).
+        // Not "this beamline has no beam stop": it is also what a comparison drawn about the wrong
+        // point returns, so an unexpected answer here is worth reading against the centre named
+        // above first.
         if (shadowed == 0)
-            logger.Warning("Beam stop: no shadow found in {} images. The search starts from the beam "
-                           "centre in the file, so this points at that centre rather than at the "
-                           "experiment; --estimate-beam-center measures it", finder.GetFrameCount());
+            logger.Warning("Beam stop: no shadow found in {} images. The comparison is made about "
+                           "the centre named above, so this may point at that centre rather than "
+                           "at the experiment",
+                           finder.GetFrameCount());
         else
             logger.Info("Beam stop shadow: {} pixels ({:.2f}% of the detector) found in {} images",
                         shadowed, 100.0 * static_cast<double>(shadowed) / static_cast<double>(shadow.size()),
                         finder.GetFrameCount());
     }
 
-    // The beam centre comes after, so that the shadow is in the mask by the time it is placed and
-    // the holder arm - the largest azimuthal asymmetry on the detector - is out of the way of the
-    // background the centre is read from.
+    // The beam centre is fitted again here, so that the shadow is in the mask by the time it is
+    // placed and the holder arm - the largest azimuthal asymmetry on the detector - is out of the
+    // way of the background the centre is read from. This is the answer the run reports and
+    // consumes; the fit above only chose where to draw the rings, and is thrown away.
 
     // What the scattered background makes the centre, measured on EVERY run and committed on none.
     // The fit reads the projection the beam-stop pre-pass has just built and no frame of its own, so
@@ -1141,28 +1215,58 @@ void Rugnux::PreScan(int start_image, int images_to_process, int frame_count, Ru
     // second pass of a two-pass run the shadow is already in the mask, so this does not run again -
     // by then the centre has been post-refined and the file's value is no longer what is in it.
     if (want_shadow && config_.beam_center_check) {
-        background_center_ = FindBeamCenterFromBackground(experiment_, pixel_mask_,
-                                                          finder.GetMeanProjection(), config_.nthreads);
+        const auto t0 = std::chrono::steady_clock::now();
+        BeamCenterFFTResult capture;
+        background_center_ = FindBeamCenter(experiment_, pixel_mask_, finder.GetMeanProjection(),
+                                            config_.nthreads, &capture);
         measured_beam_center_ = background_center_;
+        const auto capture_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                                        std::chrono::steady_clock::now() - t0).count();
+        if (!capture.point.empty())
+            logger.Info("Beam centre capture: the strongest point-symmetry centre on the WHOLE "
+                        "detector is ({:.1f},{:.1f}), {:.1f} px from the file's; line mirrors put x "
+                        "at {:.1f} and y at {:.1f}; margins {:.1f}%/{:.1f}%/{:.1f}% (point/x/y, "
+                        "under ~3% the surface is flat). One transform set scores every candidate "
+                        "centre, so this costs the same however wrong the file is - {} ms including "
+                        "the walk that refines it",
+                        capture.point[0].beam_x_pxl, capture.point[0].beam_y_pxl,
+                        std::hypot(capture.point[0].beam_x_pxl - experiment_.GetBeamX_pxl(),
+                                   capture.point[0].beam_y_pxl - experiment_.GetBeamY_pxl()),
+                        capture.line_x.empty() ? std::numeric_limits<float>::quiet_NaN()
+                                               : capture.line_x[0].beam_x_pxl,
+                        capture.line_y.empty() ? std::numeric_limits<float>::quiet_NaN()
+                                               : capture.line_y[0].beam_y_pxl,
+                        100.0f * capture.margin_point, 100.0f * capture.margin_line_x,
+                        100.0f * capture.margin_line_y, capture_ms);
         const float need = BeamCenterNeed_pxl(experiment_);
         if (!background_center_) {
-            logger.Info("Beam centre check: the background is too flat to place the centre on this "
-                        "run - the file's ({:.2f},{:.2f}) is neither confirmed nor contradicted",
+            logger.Info("Beam centre check: neither the capture nor the walk places the centre on "
+                        "this run - the file's ({:.2f},{:.2f}) is neither confirmed nor contradicted",
                         experiment_.GetBeamX_pxl(), experiment_.GetBeamY_pxl());
         } else {
-            const float dx = background_center_->beam_x_pxl - experiment_.GetBeamX_pxl();
-            const float dy = background_center_->beam_y_pxl - experiment_.GetBeamY_pxl();
+            // Against the DIRECT BEAM, not the PONI. Both the FFT capture and the walk read the
+            // centrosymmetry of the scattered background about the point the beam lands on; the
+            // geometry's beam_x_pxl is the PONI, which parts from it by distance*tan(rot)/pixel as
+            // soon as the detector is tilted. Measured on a calibrant at 110/150/200/300 mm the
+            // capture sits 0.5-1.5 px from the fitted direct beam and 5.0/6.8/8.4/17.9 px from the
+            // fitted PONI, so comparing it with the PONI reports a disagreement the data do not
+            // have - on the in-house files, whose header carries a 0.234 deg tilt, 3.3 px of it at
+            // 120 mm against a stated need of 0.7 px.
+            const auto [direct_x, direct_y] = experiment_.GetDiffractionGeometry().GetDirectBeam_pxl();
+            const float dx = background_center_->beam_x_pxl - direct_x;
+            const float dy = background_center_->beam_y_pxl - direct_y;
             const float moved = std::hypot(dx, dy);
             const auto across = AcrossSpindle_pxl(experiment_, dx, dy);
             // Everything a reader needs to judge the header, on one line: what the file says, what the
             // background says, how far apart they are, how well the background knows its own answer,
             // and what this particular geometry asks of the centre. The last is what turns a bare pixel
             // count into a verdict - 3 px is nothing at 100 mm and a lost lattice at 500 mm.
-            logger.Info("Beam centre check: the file says ({:.2f},{:.2f}), the scattered background "
-                        "says ({:.2f},{:.2f}) +- {:.2f} px - a difference of {:.2f} px, against the "
+            logger.Info("Beam centre check: the file puts the direct beam at ({:.2f},{:.2f}), the "
+                        "scattered background "
+                        "puts it at ({:.2f},{:.2f}) +- {:.2f} px - a difference of {:.2f} px, against the "
                         "{:.2f} px this geometry asks the centre to be right to. Measured only; the "
                         "run keeps the centre in the file",
-                        experiment_.GetBeamX_pxl(), experiment_.GetBeamY_pxl(),
+                        direct_x, direct_y,
                         background_center_->beam_x_pxl, background_center_->beam_y_pxl,
                         background_center_->sigma_pxl, moved, need);
             // Three sigma, because the fit is a PRECISION and not an accuracy: on a background with no
@@ -1265,10 +1369,11 @@ void Rugnux::PreScan(int start_image, int images_to_process, int frame_count, Ru
                         }
                         if (read) {
                             extra_read[i] = 1;
-                            // The extra frames go to the beam centre alone; the width has already
-                            // been measured on the projection's own sample.
+                            // The extra frames go to the beam centre alone; the width and the powder
+                            // rings have already been measured on the projection's own sample.
+                            std::vector<float> unused_q;
                             find_spots(w, w.raw_image.image, image_idx, true, extra_spots[i],
-                                       false, width_curves);
+                                       false, width_curves, unused_q);
                         }
                     }
                 }));
@@ -1310,8 +1415,8 @@ void Rugnux::PreScan(int start_image, int images_to_process, int frame_count, Ru
         // same geometry, same projection - so this asks for it again only where it was not run.
         estimate = background_center_
                        ? background_center_
-                       : FindBeamCenterFromBackground(experiment_, pixel_mask_,
-                                                       finder.GetMeanProjection(), config_.nthreads);
+                       : FindBeamCenter(experiment_, pixel_mask_, finder.GetMeanProjection(),
+                                        config_.nthreads);
     }
     if (!estimate) {
         logger.Info("Beam centre: not measurable, keeping ({:.2f},{:.2f})",
@@ -1540,8 +1645,8 @@ ProcessResult Rugnux::Run(RugnuxObserver *observer) {
 }
 
 namespace {
-    // How much better one pass's search merge has to be for the run to move off the other. Used by the
-    // beam-centre arbitration and by the cross-pass quality guard, both in RunAllPasses.
+    // How much better the alternative beam centre's search merge has to be for the run to move off
+    // the centre the file gave it (the beam-centre arbitration in RunAllPasses).
     constexpr double MAX_CC_HALF_LOSS = 0.05;
 
     // Say so rather than printing a zero that reads as a measurement. ("not compared", not "not
@@ -1554,74 +1659,124 @@ namespace {
                            pass1.search_merge_completeness);
     }
 
+    // Whether the two passes describe their lattice in the same setting, which is what makes a count
+    // of reflections at a given Miller index the same count on both sides. A pass that re-indexes at
+    // the refined geometry can settle on a centred setting of the same lattice the other pass held
+    // primitive; the cells are then different bases and only the counts taken over all reflections
+    // survive the change.
+    bool SameSetting(const ProcessResult &pass1, const ProcessResult &pass2) {
+        if (pass1.consensus_centering != pass2.consensus_centering
+            || !pass1.consensus_cell || !pass2.consensus_cell)
+            return false;
+        const UnitCell &c1 = *pass1.consensus_cell, &c2 = *pass2.consensus_cell;
+        const auto same_length = [](double a, double b) { return std::abs(a - b) <= 0.05 * (a + b) / 2; };
+        return same_length(c1.a, c2.a) && same_length(c1.b, c2.b) && same_length(c1.c, c2.c);
+    }
+
     // Pass 2 is normally the better answer, which is why it is the canonical output - but it is not
-    // guaranteed to be. Two ways it can be wrong: it merges more unique reflections than the cell it
-    // settled on can hold (completeness above 100% is arithmetically impossible and means the cell is
-    // wrong), or its CC1/2 collapses relative to pass 1. Both bounds are set where only a failure
-    // reaches them, so a normal run - where pass 2 is a little better - keeps pass 2. Returns why the
-    // refined pass is worse, in the words the run reports it in, or an empty string when it is not.
+    // guaranteed to be. Returns why the refined pass is worse, in the words the run reports it in, or
+    // an empty string when it is not.
+    //
+    // The comparison is made on each pass's SEARCH merge, not on the final one. Each pass determines
+    // its own space group, so the two final merges can be in different groups, and a completeness or a
+    // correlation in different groups are not the same measurement. The search merge is P1 on both
+    // sides (or the group the user fixed), over the full resolution range and before any correction
+    // surface is fitted - and it is counted over the centring-allowed reflections on both sides, so
+    // that a pass which finds a centring the other did not is not judged on the extinguished half it
+    // merged as noise (see the capture in RunPipeline).
+    //
+    // What the two passes are compared on there is the SIGNAL each measured - the reflections it
+    // merged at I/sigma >= 2 - and not, as this guard decided until it was measured, that merge's
+    // CC1/2. Two measurements settled it:
+    //   - Against an EXTERNAL arbiter (the site's own XDS merge of the same images, scored over a
+    //     resolution range common to the arms) the count of unique reflections at I/sigma >= 2 agreed
+    //     with which geometry is the more accurate one on 23 of 27 arm-dataset pairs. R_meas, CC1/2
+    //     and ISa - which measure whether a merge agrees with ITSELF - agreed on 13 of 27, a coin flip.
+    //   - This merge's CC1/2 is pooled over the whole range, uncut and uncorrected, so the shells with
+    //     no signal in them dominate it and they are exactly the shells a geometry move disturbs: it
+    //     reads 0.13 on a crystal whose data merge at 0.995, and 0.93 against 0.76 on two runs whose
+    //     merged data agree to 0.7% of R_meas. Deciding on it sent two crystals back to a geometry
+    //     that ships 22% fewer reflections than the one they refused.
+    //
+    // Three ways the refined pass can be worse, then: it merges more unique reflections than the cell
+    // it settled on can hold, it measured decisively less signal, or it lost the axial rows.
     //
     // The completeness arm only bites when the search merge is in a fixed group (-S). De novo that
-    // merge is in P1 and does not count its possible reflections at all, so there is no
-    // completeness and CC1/2 decides alone. Counting them there was measured and not taken: it
-    // costs 5.2 ms, but a merge that fills its own asymmetric unit reads 27-43% of the P1
-    // hemisphere over 28 rotation crystals, so the 100.5% bound is never approached and no
-    // decision changes - it would only put a figure into the report that reads as the dataset's
-    // completeness and is not one. Two cheaper stand-ins were measured on that corpus and failed:
-    // pass 2's search-merge OBSERVATION count never drops below 90% of pass 1's even when pass 2
-    // predicts 44% fewer partials, and pass 2's search-merge COMPLETENESS relative to pass 1's
-    // fires only on passes that reached FINER, because this merge is never resolution-cut and the
-    // possible list grows with the range - it reverted two healthy crystals and rescued none.
-    //
-    // The comparison is made on each pass's SEARCH merge, not on the final one. Each pass
-    // determines its own space group, so the two final merges can be in different groups, and
-    // completeness and CC1/2 in different groups are not the same measurement. The search merge is
-    // P1 on both sides, over the full resolution range and before any correction surface is fitted
-    // - the one merge the two passes make in the same terms.
+    // merge is in P1 and does not count its possible reflections at all, so there is no completeness
+    // and it does not arm. Counting them there was measured and not taken: it costs 5.2 ms, but a
+    // merge that fills its own asymmetric unit reads 27-43% of the P1 hemisphere over 28 rotation
+    // crystals, so the 100.5% bound is never approached and no decision changes - it would only put a
+    // figure into the report that reads as the dataset's completeness and is not one.
     //
     // Asked twice, from the same numbers: in RunAllPasses, where the answer is acted on, and inside a
     // refined pass as soon as its own search merge is in - a pass that already knows it will be thrown
     // away leaves its report and its files unwritten (see the superseded flag in RunPipeline).
     std::string RefinedPassIsWorse(const ProcessResult &pass1, const ProcessResult &pass2) {
         constexpr double MAX_CREDIBLE_COMPLETENESS = 100.5;   // rounding headroom, nothing more
-        // The third arm: the axial rows. CC1/2 is an average over tens of thousands of reflections and
-        // the principal axial rows are a few dozen of them, so a pass can measure half the row and
-        // move CC1/2 by nothing - yet those are the reflections the systematic absences are read off,
-        // and losing them costs a screw axis and with it the space group. It happens because a
-        // reflection on an axial row crosses the Ewald sphere over a narrow range of the sweep, where a
-        // general reflection is spread over it: a pass that loses a wedge of the sweep loses whole
-        // axial rows while its bulk statistics improve, which is exactly what a wedge-losing pass looks
-        // like from CC1/2 - better. Measured over a dozen rotation crystals the two passes agree on
-        // this count to within 9% and usually exactly; the crystal this arm was written for measured
-        // 44%.
+        // How much of the signal the refined pass has to lose before the run moves back off the
+        // geometry it measured. This is not a quality bar: it is set above what the two passes differ
+        // by for reasons that are not the geometry, and they never integrate quite the same way - the
+        // canonical pass integrates at the measured spot width where the pre-pass integrated at the
+        // default, and it predicts with the pre-pass's smoothed mosaicity. Measured over ~100 rotation
+        // crystals, that alone moves the count by -2% to +35%, and on a crystal where the two passes
+        // ran at the SAME geometry it moved it +10% (and the CC1/2 this guard used to decide on by
+        // -0.25). Below this, the difference says nothing about the geometry, and a comparison that
+        // cannot tell keeps the geometry the run measured.
+        constexpr double DECISIVE_SIGNAL_LOSS = 0.10;
+        // ... and the loss has to be a loss rather than a dilution. The wider disk pulls weaker
+        // reflections into the merge and the error model is then refitted over them, so a pass can hold
+        // MORE reflections and fewer of them at I/sigma >= 2 without having measured less of the
+        // crystal: measured, one crystal merges 2.1x the reflections in its refined pass, a third of
+        // the strong ones, and its refined pass is the better answer by every final statistic. Where
+        // the refined pass holds no more reflections and fewer strong ones, the loss is a loss.
         //
-        // It only decides where CC1/2 does not: a pass that wins on CC1/2 by more than the loss the arm
-        // above already tolerates has said something about the bulk of the data that a few dozen
-        // reflections cannot answer, and is kept. And it needs pass 1 to have measured enough of the
-        // rows for the comparison to mean anything - below eight there is no zone a screw could be
-        // claimed on either side, so the difference decides nothing.
+        // The other arm: the axial rows. A bulk statistic is an average over tens of thousands of
+        // reflections and the principal axial rows are a few dozen of them, so a pass can measure half
+        // the row and move it by nothing - yet those are the reflections the systematic absences are
+        // read off, and losing them costs a screw axis and with it the space group. It happens because
+        // a reflection on an axial row crosses the Ewald sphere over a narrow range of the sweep, where
+        // a general reflection is spread over it: a pass that loses a wedge of the sweep loses whole
+        // axial rows while its bulk statistics improve. Measured over a dozen rotation crystals the two
+        // passes agree on this count to within 9% and usually exactly; the crystal this arm was written
+        // for measured 44%.
+        //
+        // It is asked only where the two counts are counts of the SAME reflections: the a and b of a
+        // C-centred setting are the face diagonals of the primitive cell, so "h00" is a different
+        // direction in the two merges and the two rows are not comparable at all. And it needs pass 1
+        // to have measured enough of the rows for the difference to mean anything - below eight there
+        // is no zone a screw could be claimed on either side. A pass that measured decisively more
+        // signal has said something about the bulk of the data that a few dozen reflections cannot
+        // answer, and is kept.
         constexpr double MIN_AXIAL_ROWS_KEPT = 0.75;
         constexpr int64_t MIN_AXIAL_ROWS_TO_COMPARE = 8;
-        const double cc1 = pass1.search_merge_cc_half;
-        const double cc2 = pass2.search_merge_cc_half;
+        const double strong1 = static_cast<double>(pass1.search_merge_strong_reflections);
+        const double strong2 = static_cast<double>(pass2.search_merge_strong_reflections);
         const int64_t axial1 = pass1.search_merge_axial_reflections;
         const int64_t axial2 = pass2.search_merge_axial_reflections;
-        const bool lost_axial_rows = axial1 >= MIN_AXIAL_ROWS_TO_COMPARE
+        const bool measured_less = strong1 > 0 && strong2 < (1.0 - DECISIVE_SIGNAL_LOSS) * strong1
+                                   && pass2.search_merge_reflections <= pass1.search_merge_reflections;
+        const bool measured_more = strong1 > 0 && strong2 > (1.0 + DECISIVE_SIGNAL_LOSS) * strong1;
+        const bool lost_axial_rows = SameSetting(pass1, pass2)
+                                     && axial1 >= MIN_AXIAL_ROWS_TO_COMPARE
                                      && axial2 < MIN_AXIAL_ROWS_KEPT * static_cast<double>(axial1)
-                                     && cc2 < cc1 + MAX_CC_HALF_LOSS;
+                                     && !measured_more;
         const bool worse = pass2.lattice_conflicts_with_fixed_sg
                 || (pass1.search_merge_completeness_measured
                     && pass2.search_merge_completeness_measured
                     && pass2.search_merge_completeness > MAX_CREDIBLE_COMPLETENESS)
-                || cc2 < cc1 - MAX_CC_HALF_LOSS || lost_axial_rows;
+                || measured_less || lost_axial_rows;
         if (!worse)
             return {};
-        return (cc2 < cc1 - MAX_CC_HALF_LOSS || !lost_axial_rows)
-                ? fmt::format("{}, CC1/2 before corrections {:.3f} vs {:.3f}",
-                              SearchMergeCompletenessText(pass1, pass2), cc2, cc1)
-                : fmt::format("it holds {} of the {} low-order axial reflections the header-geometry "
-                              "pass measured, and its CC1/2 before corrections {:.3f} vs {:.3f} does "
-                              "not say it is better", axial2, axial1, cc2, cc1);
+        return lost_axial_rows && !measured_less
+                ? fmt::format("it holds {} of the {} low-order axial reflections the header-geometry "
+                              "pass measured, and its {} reflections at I/sigma >= 2 against {} do not "
+                              "say it is better", axial2, axial1,
+                              pass2.search_merge_strong_reflections,
+                              pass1.search_merge_strong_reflections)
+                : fmt::format("{}, {} reflections at I/sigma >= 2 before corrections against {}",
+                              SearchMergeCompletenessText(pass1, pass2),
+                              pass2.search_merge_strong_reflections,
+                              pass1.search_merge_strong_reflections);
     }
 }
 
@@ -1814,12 +1969,68 @@ ProcessResult Rugnux::RunAllPasses(RugnuxObserver *observer) {
         logger.Info("Rotation two-pass geometry post-refinement: second pass (refined geometry, canonical) -> {}_*",
                     base_prefix);
         config_.output_prefix = base_prefix;   // the refined pass is the canonical result (no _02 suffix)
+        // The canonical pass measures the post-refinement again where the pre-pass moved the geometry
+        // (it applies nothing), so that the walk below has something to decide on.
+        postrefine_probe_ = prepass_detector_geometry_.has_value();
         auto pass2 = RunPipeline(observer, /*write_output=*/true, /*geometry_prepass=*/false);
+
+        // Walk the geometry to the fit's fixed point. The post-refinement is fitted to reflections
+        // integrated at the very geometry it is correcting, so one fit reaches only as far as those
+        // reflections see: on a header whose distance is several percent long, the pre-pass absorbs the
+        // error into an inflated cell, and from that self-consistent pair the fit finds a fraction of it
+        // and stops. The canonical pass has just re-integrated and re-indexed at what it committed, so
+        // asking the same fit there is the next step of the same walk - and that re-indexing is also the
+        // RATIFICATION the old size bound stood in for: a second lattice does not index better at a
+        // geometry it did not come from, a wrong header does, and a pass that lost the crystal is thrown
+        // out by the quality guard below, which returns the run to the header geometry.
+        //
+        // What starts the walk is a move of more than one step: that is the fit saying the geometry is
+        // somewhere else entirely rather than a fraction of a percent away, and it leaves every run
+        // whose fit settles beside its header at the two passes it always had. Once the run IS walking
+        // it keeps walking while the fit still commits, because the steps do not get smaller in
+        // proportion to what is left: measured on a header 3.9 % long, the first round took a third of
+        // the error and each of the next took a third of the rest. The walk is bounded rather than
+        // stopped at a size, because there is no size that separates the last step of a real walk from
+        // the first step of a runaway - and it does not run away: started BELOW the optimum the same fit
+        // turns back up, so it settles around the answer instead of past it.
+        constexpr int MAX_GEOMETRY_ROUNDS = 4;
+        std::optional<std::array<float, 5>> adopted_geometry;
+        int geometry_rounds = 0;
+        while (!cancelled_ && geometry_rounds < MAX_GEOMETRY_ROUNDS && prepass_detector_geometry_
+               && pass2.post_refine && pass2.post_refine->detector_refined
+               && (pass2.post_refine->large_move || geometry_rounds > 0)) {
+            adopted_geometry = *prepass_detector_geometry_;
+            const auto &g = *adopted_geometry;
+            logger.Info("Two-pass: the post-refinement at the adopted geometry still moves it "
+                        "(distance {:.3f} -> {:.3f} mm) - re-integrating and re-indexing at what it "
+                        "asks for (round {} of at most {})", pass2.post_refine->distance_before_mm,
+                        pass2.post_refine->distance_after_mm, geometry_rounds + 1,
+                        MAX_GEOMETRY_ROUNDS);
+            experiment_.BeamX_pxl(g[0]).BeamY_pxl(g[1]).DetectorDistance_mm(g[2])
+                       .PoniRot1_rad(g[3]).PoniRot2_rad(g[4]);
+            pass2 = RunPipeline(observer, /*write_output=*/true, /*geometry_prepass=*/false);
+            ++geometry_rounds;
+        }
+        postrefine_probe_ = false;
+
         // The post-refinement is measured by pass 1 and consumed by pass 2, so carry it onto whichever
-        // result is returned - it is a result of the run, not of the pass that happened to fit it.
+        // result is returned - it is a result of the run, not of the pass that happened to fit it. Where
+        // the walk took rounds they are ONE geometry decision, so what the report names is where the
+        // geometry started and where the run left it, not the first step of the way there.
+        if (geometry_rounds > 0 && pass1.post_refine && adopted_geometry) {
+            pass1.post_refine->beam_x_after_px = (*adopted_geometry)[0];
+            pass1.post_refine->beam_y_after_px = (*adopted_geometry)[1];
+            pass1.post_refine->distance_after_mm = (*adopted_geometry)[2];
+        }
         pass2.post_refine = pass1.post_refine;
-        pass2.pass_number = 2;
-        pass2.pass_count = 2;
+        pass2.pass_number = 2 + geometry_rounds;
+        pass2.pass_count = 2 + geometry_rounds;
+        if (geometry_rounds > 0)
+            pass2.pass_decision = fmt::format(
+                    "post-refined geometry adopted over {} rounds: the fit was still walking at each of "
+                    "them, and the detector distance ended at {:.3f} mm against the header's {:.3f}",
+                    geometry_rounds + 1, (*adopted_geometry)[2],
+                    pass1.post_refine ? pass1.post_refine->distance_before_mm : 0.0);
 
         // r2 = r1 + 2 is also the inner edge of the background ring, so widening the signal disk pushes
         // that ring out into the neighbours; a reflection whose ring is left with five or fewer clean
@@ -1938,9 +2149,9 @@ ProcessResult Rugnux::RunAllPasses(RugnuxObserver *observer) {
             }
             if (pass2.pass_decision.empty())
                 pass2.pass_decision = fmt::format(
-                        "post-refined geometry adopted ({}, CC1/2 before corrections {:.3f} vs {:.3f})",
-                        SearchMergeCompletenessText(pass1, pass2), pass2.search_merge_cc_half,
-                        pass1.search_merge_cc_half);
+                        "post-refined geometry adopted ({}, {} reflections at I/sigma >= 2 before "
+                        "corrections against {})", SearchMergeCompletenessText(pass1, pass2),
+                        pass2.search_merge_strong_reflections, pass1.search_merge_strong_reflections);
         }
         if (pass2.pass_decision.empty())
             pass2.pass_decision = (prepass_detector_geometry_ || prepass_rotation_scale_)
@@ -2367,6 +2578,11 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
         // hand their spots back and this thread puts them in, so the map itself is still only ever
         // touched from here and needs no locking.
         std::map<int, std::vector<SpotToSave>> spot_cache;
+        // The azimuthal mapping the first pass finds its spots against. It is `mapping` until a
+        // beam-centre hypothesis moves the centre, and the hypothesis's own mapping while it stands -
+        // the mapping is where the resolution of every pixel and the finder's radial background bins
+        // come from, and both move with the centre.
+        const AzimuthalIntegrationMapping *spot_mapping = &mapping;
         // The spots of one frame, found with the caller's own analysis engine. A frame's spots are a
         // pure function of that frame and the settings - the engine carries nothing from one image to
         // the next, which is why the main image loop can give one to each of its workers - so it does
@@ -2448,9 +2664,9 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                     SpotEngine &e = engines[t];
                     if (!e.analysis) {
                         e.analysis = std::make_unique<MXAnalysisWithoutFPGA>(
-                                experiment_, mapping, pixel_mask_, *indexer,
+                                experiment_, *spot_mapping, pixel_mask_, *indexer,
                                 /*enable_fused_adaptive_gpu=*/true);
-                        e.profile = std::make_unique<AzimuthalIntegrationProfile>(mapping);
+                        e.profile = std::make_unique<AzimuthalIntegrationProfile>(*spot_mapping);
                     }
                     for (size_t i = next.fetch_add(1); i < wanted.size(); i = next.fetch_add(1))
                         found[i] = find_spots(*e.analysis, *e.profile, e.raw_image, wanted[i]);
@@ -2478,6 +2694,40 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                 f.get();
         };
 
+        // Evaluating a beam-centre hypothesis means re-finding the spots at that centre. The spot
+        // POSITIONS do not move with the centre - which is why the cache is keyed by image alone - but
+        // the spot LIST does: every spot's d, the ice-ring flag, the resolution mask the finder
+        // applies, the high-resolution gap cut and the strongest-N budget are all radial, and the
+        // adaptive finder's ring background is binned about the centre. Scoring a trial centre against
+        // spots found at the file's put the ladder in a world the run never enters: measured, a centre
+        // scored 42/60 inside the ladder and 5/60 when that same value was given on the command line.
+        //
+        // A trial therefore gets its own azimuthal mapping, its own engines and its own cache, and the
+        // starting centre's spots are PARKED rather than thrown away - a hypothesis that is not adopted
+        // has to leave the rest of the run exactly as it found it.
+        std::unique_ptr<AzimuthalIntegrationMapping> trial_mapping;
+        std::map<int, std::vector<SpotToSave>> home_spot_cache;
+        const auto try_beam_center = [&](float x, float y) {
+            if (trial_mapping)
+                spot_cache.clear();
+            else
+                home_spot_cache.swap(spot_cache);
+            experiment_.BeamX_pxl(x).BeamY_pxl(y);
+            release_spot_engines();
+            trial_mapping = std::make_unique<AzimuthalIntegrationMapping>(experiment_, pixel_mask_);
+            spot_mapping = trial_mapping.get();
+        };
+        const auto restore_beam_center = [&](float x, float y) {
+            if (!trial_mapping)
+                return;
+            experiment_.BeamX_pxl(x).BeamY_pxl(y);
+            release_spot_engines();
+            trial_mapping.reset();
+            spot_mapping = &mapping;
+            spot_cache = std::move(home_spot_cache);
+            home_spot_cache.clear();
+        };
+
         // How many validation frames a candidate global lattice actually indexes per image, scored on
         // the *real* per-image path (force the candidate, then run the same indexing+refinement the
         // main loop uses). A cell that merely fits the accumulated first-pass cloud (a spurious
@@ -2538,6 +2788,75 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
             return count.load();
         };
 
+        // The run's acceptance test counts SPOTS, not frames. Summing each validation frame's spots
+        // before any threshold lets a four-spot frame contribute four spots of evidence instead of an
+        // automatic "no", and removes the spots-per-frame denominator that makes a frame count measure
+        // how sparse the pattern is rather than how good the lattice is: with 4 spots on an average
+        // frame no lattice, the true one included, can clear a bar of six indexed spots per frame.
+        //
+        // `shift` displaces each frame's spots onto another validation frame's spindle angle. The
+        // lattice, the spots, the geometry and the per-frame orientation polish are all unchanged and
+        // only the claim under test is removed - that these spots are at these angles - so what a
+        // displaced run still puts on the lattice is what chance and the polish give for free. That is
+        // the bar the real count is measured against, and it is measured rather than chosen, so no
+        // spots-per-frame number survives anywhere in the test.
+        auto pooled_on_lattice = [&](IndexAndRefine &idx, const RotationIndexerResult &r,
+                                     int shift) -> int64_t {
+            idx.ForceRotationIndexerResult(r);
+            prefetch_spots(validation);
+            std::atomic<int64_t> on_lattice = 0;
+            ParallelFor(static_cast<int>(validation.size()),
+                        std::min<size_t>(validation.size(), config_.nthreads), [&](int i) {
+                DataMessage m{};
+                m.number = validation[(i + shift) % validation.size()];
+                m.spots = spot_cache.at(validation[i]);
+                on_lattice += idx.CountSpotsOnLattice(m, validation_settings);
+            });
+            return on_lattice.load();
+        };
+
+        // The pooled evidence for one candidate lattice: the validation frames' non-ice spots, how many
+        // of them lie on the candidate, and how many a wrong spindle angle still puts there.
+        struct PooledEvidence {
+            int64_t spots = 0;
+            int64_t on_lattice = 0;
+            int64_t by_chance = 0;
+        };
+
+        // Displacements are a fixed fraction of the sweep, so the null is a function of the data alone
+        // and the same file gives the same verdict every time. Sevenths: no crystallographic rotation
+        // is a seventh of a turn, so a displacement cannot coincide with a symmetry about the spindle
+        // and hand the null the signal's own score. The median over five of them bounds what one
+        // unlucky displacement can do.
+        auto pooled_evidence = [&](IndexAndRefine &idx, const RotationIndexerResult &r) {
+            PooledEvidence e;
+            e.on_lattice = pooled_on_lattice(idx, r, 0);
+            const bool index_ice_rings = experiment_.GetIndexingSettings().GetIndexIceRings();
+            for (const int ordinal : validation)
+                for (const auto &sp : spot_cache.at(ordinal))
+                    if (index_ice_rings || !sp.ice_ring)
+                        e.spots++;
+            const int n = static_cast<int>(validation.size());
+            std::vector<int64_t> chance;
+            for (int k = 1; k <= 5; k++)
+                chance.push_back(pooled_on_lattice(idx, r, std::max(1, k * n / 7)));
+            std::sort(chance.begin(), chance.end());
+            e.by_chance = chance[chance.size() / 2];
+            return e;
+        };
+
+        // This crystal's lattice is the one that puts materially more spots on itself than a wrong
+        // angle does. The excess is counted against the binomial noise of the null's own rate over the
+        // same spots, so the bar scales with the evidence in hand and carries no absolute count; the
+        // significance is the one-false-positive-in-a-thousand bar the spot-budget measurement is
+        // already set at. A null that indexed nothing is still credited with one spot of noise, as the
+        // next displacement could have found one.
+        auto beats_chance = [](const PooledEvidence &e) {
+            const double p = static_cast<double>(e.by_chance) / static_cast<double>(std::max<int64_t>(1, e.spots));
+            const double sigma = std::sqrt(std::max(1.0, static_cast<double>(e.spots) * p * (1.0 - p)));
+            return static_cast<double>(e.on_lattice - e.by_chance) > SPOT_BUDGET_SIGNIFICANCE_Z * sigma;
+        };
+
         // How deep into an image's intensity-ordered spot list this lattice is still being seen - the
         // measured spot budget. Same frames, same per-image path as count_indexed above, but scoring the
         // spots rather than the frames: each frame's spots are tallied by rank and the run keeps the
@@ -2573,8 +2892,10 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
         // rather than the whole list because the "wedge" scheme stops on the accumulation cap, and how
         // far into the sweep that is only becomes known as the frames arrive.
         constexpr int SPOT_PREFETCH_CHUNK = 64;
+        size_t first_pass_spots_per_image = 0;   // 0 = the indexer's own default
         auto feed_scheme = [&](IndexerThreadPool &pool, const std::vector<int> &ordinals) {
             auto ri = std::make_unique<RotationIndexer>(experiment_, pool);
+            ri->MaxSpotsPerImage(first_pass_spots_per_image);
             for (size_t i = 0; i < ordinals.size(); i++) {
                 if (cancelled_ || ri->AccumulationFull())
                     break;
@@ -2798,6 +3119,254 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
             return bp;
         };
 
+        // Powder-ring rescue - and, with it, the lean seed the rotation first pass never had.
+        //
+        // The pre-scan has already measured this sample's powder rings (see PreScan): a crystalline
+        // phase other than the crystal, whose reflections the indexer is otherwise handed as if they
+        // were this crystal's. Hexagonal ice is the only such phase whose rings can be named in
+        // advance, and the spot finder flags it from that fixed list; everything else - a shower of
+        // microcrystals, a salt out of the cryoprotectant, a phase nobody expected - has to be
+        // measured, and until it is, every one of its spots goes into the FFT. Measured on one such
+        // crystal: 876 spots a frame against the 80 a clean crystal on the same beamline gives, 70 %
+        // of them on rings, no scheme indexing a single validation frame, and the FFT taking a 10-30 A
+        // cell out of the shells.
+        //
+        // Setting the rings aside is half of it. The other half is HOW DEEP into each frame's spot
+        // list the first pass reads. It has always read 200 spots an image; the per-frame indexer, on
+        // the same problem, escalates 30 -> 80 -> the whole list and keeps the seed a lattice explains
+        // the largest fraction of (IndexAndRefine::DetermineLatticeAndSymmetry), because on a flooded
+        // frame a lean high-quality seed finds the lattice where the full list derails the search. The
+        // rotation pass gets the same escalation here. It is the general statement of what a
+        // resolution cut would do on this one crystal - the contaminant and the noise sit at the deep
+        // end of the intensity-ordered list wherever in resolution they happen to lie - and it needs
+        // nothing measured about where they are.
+        //
+        // It runs LAST: after every other rescue and after the pass-1 fallback above, on a run that
+        // would otherwise stop with no lattice at all. Measured over 100 datasets: placed earlier it
+        // pre-empted the rescues that already work - a crystal the beam-centre ladder fixes at 59/60
+        // and one the pass-1 fallback fixes at 60/60 both came out WORSE, because this ladder had
+        // already replaced the standing pass those rescues start from. A last resort has to be last.
+        //
+        // The two compose: FilterSpotsByCount has already ordered each image's spots non-ring first
+        // and strongest first, so a lean cap takes the crystal's strongest reflections and nothing
+        // else. Decided late, the way the axis sign above is: index each rung, keep the one that
+        // indexes the most validation frames. A run that already indexes never reaches here, and one
+        // that does cannot lose by trying - where the rings are the crystal's own rows, or where the
+        // crystal needs its deep spots to index at all, the pass that already ran stands.
+        
+        // Called from two places, because the two questions it answers are coupled: a centre that is
+        // wrong and a spot list that is too deep each hide the other, exactly as the centre and the
+        // axis sign do above. `score_before` is what the caller's standing pass indexes and `min_gain`
+        // is what a rung must beat it by; nothing is changed and the settings are put back when no
+        // rung does.
+        // What the run is CURRENTLY reading each frame at. It starts at what the file asked for, and
+        // only an ADOPTED rung moves it. Every rung the ladder tries is put back to this, so a rung
+        // tried and rejected leaves nothing behind - and a later pass that finds no rung restores what
+        // an earlier pass adopted rather than resetting the run to the defaults.
+        const auto first_pass_file_d_min = config_.spot_finding.high_resolution_limit;
+        struct FirstPassState { bool rings = false; size_t seed = 0; std::optional<float> d_min; };
+        FirstPassState committed{false, 0, first_pass_file_d_min};
+        const auto apply_state = [&](const FirstPassState &st) {
+            const std::vector<float> r = st.rings ? powder_.rings_q_recipA : std::vector<float>{};
+            config_.spot_finding.measured_ring_q_recipA = r;
+            validation_settings.measured_ring_q_recipA = r;
+            config_.spot_finding.high_resolution_limit = st.d_min;
+            validation_settings.high_resolution_limit = st.d_min;
+            first_pass_spots_per_image = st.seed;
+            spot_cache.clear();   // the per-image spot budget is spent again under these settings
+        };
+
+        // min_score is an ABSOLUTE bar beside the gain. A caller that takes a rung only when it
+        // indexes a majority must not be handed a state the ladder committed on a lesser rung:
+        // measured, the ladder adopted at 29/60, the caller rejected it against a majority of 30, and
+        // nothing put the settings back - the beam-centre walk that followed then scored every
+        // hypothesis on the leaked lean spot lists.
+        const auto first_pass_ladder =
+                [&](int score_before, int min_gain, int min_score) -> std::optional<FirstPass> {
+            if (cancelled_)
+                return std::nullopt;
+
+            // The seeds, leanest first. The same ladder the per-frame indexer uses, one rung deeper
+            // because a rotation cloud pools many frames and can afford more.
+            // The last rung is EVERY spot of each frame: SIZE_MAX, not 0 - RotationIndexer reads 0 as
+            // "use my default", which is 200, so a 0 here made the deepest rung a duplicate of the
+            // 200 one and the log line "the whole spot list" a lie.
+            constexpr std::array<size_t, 4> SEEDS = {30, 80, 200, std::numeric_limits<size_t>::max()};
+            struct Rung { bool rings; size_t seed; std::optional<float> d_min; };
+            // How much of each frame a rung let the first pass see: more spots an image, and further
+            // in resolution, is more evidence. Rings set aside is not part of it - that is a
+            // measurement of the sample, not a depth.
+            const auto Deeper = [](const Rung &a, const Rung &b) {
+                if (a.seed != b.seed) return a.seed > b.seed;
+                const float da = a.d_min.value_or(0.0f), db = b.d_min.value_or(0.0f);
+                return da < db;   // a smaller d_min reaches further; 0 means the detector edge
+            };
+            // The file's OWN limit, captured before any rung committed anything. Reading it out of
+            // config_ here would read back the previous rung's floor once a pass has adopted one, and
+            // the restore path would then "put back" that instead of what the file asked for.
+            const auto file_limit = first_pass_file_d_min;
+            std::vector<Rung> rungs;
+            // Where a floor is worth trying at all - the rings merged somewhere inside the measured
+            // range, so past that point nothing can be told from the crystal and a pass that reads
+            // there is reading the contaminant.
+            std::vector<std::optional<float>> floors = {file_limit};
+            for (const float d : prescan_spot_quantile_d_A_)
+                if (!file_limit || d > *file_limit) floors.emplace_back(d);
+            for (const size_t seed : SEEDS)
+                for (const auto &d_min : floors) {
+                    if (!powder_.rings_q_recipA.empty())
+                        rungs.push_back({true, seed, d_min});
+                    if (powder_.rings_q_recipA.empty() && seed != SEEDS.back())
+                        rungs.push_back({false, seed, d_min});
+                }
+
+            // Every rung's score, so the choice below can be made on all of them at once.
+            std::vector<int> rung_score(rungs.size(), -1);
+            std::vector<FirstPass> rung_pass(rungs.size());
+            int won = -1;
+            for (size_t i = 0; i < rungs.size() && !cancelled_; i++) {
+                apply_state({rungs[i].rings, rungs[i].seed, rungs[i].d_min});
+                FirstPass alt = pick_best(*indexer_pool, *indexer);
+                logger.Info("  first-pass rung: {} spots/image, rings {}, stop at {} -> {}/{} frames{}",
+                            rungs[i].seed == std::numeric_limits<size_t>::max()
+                                ? std::string("all") : std::to_string(rungs[i].seed),
+                            rungs[i].rings ? "aside" : "kept",
+                            rungs[i].d_min ? fmt::format("{:.2f} A", *rungs[i].d_min)
+                                           : std::string("the detector edge"),
+                            alt.result.has_value() ? alt.score : -1,
+                            static_cast<int>(validation.size()),
+                            alt.result.has_value()
+                                ? fmt::format(", {}{} {:.1f} {:.1f} {:.1f} {:.1f} {:.1f} {:.1f}",
+                                              alt.result->search_result.centering,
+                                              gemmi::crystal_system_str(alt.result->search_result.system),
+                                              alt.result->search_result.conventional.GetUnitCell().a,
+                                              alt.result->search_result.conventional.GetUnitCell().b,
+                                              alt.result->search_result.conventional.GetUnitCell().c,
+                                              alt.result->search_result.conventional.GetUnitCell().alpha,
+                                              alt.result->search_result.conventional.GetUnitCell().beta,
+                                              alt.result->search_result.conventional.GetUnitCell().gamma)
+                                : std::string());
+                // A rung has to WIN by the count the run itself keeps a lattice on - a sixth of the
+                // validation frames, the bar below - not merely come out ahead. Three frames out of
+                // sixty is the count's noise, and adopting on it would hand the rescues that follow
+                // (the beam centre, the long axis) a spot list cut for no reason. Measured: a marginal
+                // crystal that indexed 26/60 went to 29/60 on a rung and must not take it, where the
+                // crystals this exists for go from 0/60 to 24 and to 32/60.
+                if (alt.result.has_value()) {
+                    rung_score[i] = alt.score;
+                    rung_pass[i] = std::move(alt);
+                }
+            }
+
+            // The rung to keep. A rung has to WIN by the count the run itself keeps a lattice on - a
+            // sixth of the validation frames, the bar below - not merely come out ahead: three frames
+            // out of sixty is the count's noise, and adopting on it would hand the rescues that follow
+            // (the beam centre, the long axis) a spot list cut for no reason. Measured: a marginal
+            // crystal that indexed 26/60 went to 29/60 on a rung and must not take it.
+            //
+            // Among the rungs that do win it is the highest count that is kept, and an exact tie goes
+            // to the rung that saw the MOST of each frame. Ties are common - on a pattern where the
+            // contaminant sits past a resolution, every seed behind that resolution returns the same
+            // lattice and the same count - and where they happen the rung that read deepest rests on
+            // the most evidence. Only an exact tie, not a band: the count is what tells a lattice that
+            // works from one that does not, and a rung three frames behind is behind.
+            for (size_t i = 0; i < rungs.size(); i++) {
+                if (rung_score[i] < 0 || rung_score[i] - score_before < min_gain
+                    || rung_score[i] < min_score)
+                    continue;
+                if (won < 0 || rung_score[i] > rung_score[won]
+                    || (rung_score[i] == rung_score[won] && Deeper(rungs[i], rungs[won])))
+                    won = static_cast<int>(i);
+            }
+
+            // ...and it must not be an axis SUB-MULTIPLE of a cell another rung found. The frame
+            // count the choice above is made on cannot arbitrate an axis harmonic - a cell twice as
+            // long has to place every spot twice as accurately to score the same, which the scheme
+            // comparison above says in the same words - and here the two biases compound, because
+            // the leanest and shallowest rung is both the one that scores highest on a harmonic and
+            // the one a smaller cell is easiest on. Measured on one crystal: the "30 spots/image,
+            // stop at 4.91 A" rung indexed 48/60 on a HALVED c axis while the deeper rungs found 2x,
+            // 3x and 4x of the true one; the ladder took the halved cell, and the run ended in a
+            // different Bravais class on a different cell from the one it reaches with no ladder at
+            // all - the ladder had pre-empted the beam-centre walk that finds the crystal's own.
+            //
+            // So put the winner through the same axis-harmonic arbiter the scheme comparison uses:
+            // against every rung whose primitive volume is a near-integer multiple of the winner's,
+            // which cell accounts for more of the validation frames' SPOTS. A rung that loses that
+            // question is a sub-multiple, and the ladder then adopts NOTHING. It is a last resort,
+            // and a last resort that cannot tell an axis from its multiple has not rescued anything -
+            // promoting the rival instead is no better, since on the measured crystal the rival is a
+            // multiple of the true axis in its own right.
+            //
+            // Judged on the spot list the run STANDS on rather than on either rung's cut: the two
+            // cells must be counted against the same spots, and the deepest list is where the class
+            // an axis multiple adds is visible at all (see IndexedMillerIndices).
+            if (won >= 0 && rung_pass[won].vol > 1.0) {
+                apply_state(committed);
+                prefetch_spots(validation);
+                const double won_vol = rung_pass[won].vol;
+                const size_t won_spots = IndexedMillerIndices(rung_pass[won].result->lattice,
+                                                              validation_cloud(*rung_pass[won].result),
+                                                              index_tol).size();
+                for (size_t i = 0; i < rungs.size() && won >= 0; i++) {
+                    // Only a rung the caller would have taken can demote one: the winner is chosen
+                    // among those, and a rung that indexes too little to be adopted is too little
+                    // evidence to overturn one either.
+                    if (static_cast<int>(i) == won || rung_score[i] < 0
+                        || rung_score[i] - score_before < min_gain || rung_score[i] < min_score)
+                        continue;
+                    const double ratio = rung_pass[i].vol / won_vol;
+                    const double nearest = std::round(ratio);
+                    // Only a LARGER rival can demote, and only in the window the arbiter is
+                    // calibrated over (see the scheme comparison: every firing at n <= 4 read below
+                    // the chance occupancy, none above it did).
+                    if (nearest < 2.0 || nearest > 4.0 || std::abs(ratio - nearest) >= 0.15)
+                        continue;
+                    const auto hkl = IndexedMillerIndices(rung_pass[i].result->lattice,
+                                                          validation_cloud(*rung_pass[i].result),
+                                                          index_tol);
+                    const auto ev = AddedClassOccupancy(hkl, static_cast<int>(nearest));
+                    logger.Info("First-pass ladder: the winning rung's cell ({:.0f} A^3) and the "
+                                "rung at {}/{} frames ({:.0f} A^3) differ by {:.2f}x - one is an "
+                                "axis harmonic of the other. The larger accounts for {} validation "
+                                "spots against the winner's {}, and {:.1f}% of them lie off its "
+                                "({},{},{}) sub-lattice",
+                                won_vol, rung_score[i], static_cast<int>(validation.size()),
+                                rung_pass[i].vol, ratio, hkl.size(), won_spots,
+                                100.0 * ev.occupancy, ev.u, ev.v, ev.w);
+                    if (hkl.size() > won_spots) {
+                        logger.Warning("First-pass ladder: the rung that indexes the most frames does "
+                                       "so on a {:.0f}x sub-multiple of an axis another rung found, "
+                                       "which the frame count cannot see - the ladder adopts nothing "
+                                       "and the run keeps the pass it already stands on",
+                                       nearest);
+                        won = -1;
+                    }
+                }
+            }
+
+            if (won >= 0) {
+            committed = {rungs[won].rings, rungs[won].seed, rungs[won].d_min};
+            apply_state(committed);
+            logger.Info("First-pass seed: {}{}{} takes it from {}/{} validation frames to {}/{}",
+                        rungs[won].seed == std::numeric_limits<size_t>::max()
+                            ? std::string("the whole spot list")
+                            : fmt::format("the strongest {} spots an image", rungs[won].seed),
+                        rungs[won].rings
+                            ? fmt::format(", with this sample's {} measured powder rings set aside "
+                                          "for the whole run", powder_.rings_q_recipA.size())
+                            : std::string(),
+                        rungs[won].d_min && rungs[won].d_min != file_limit
+                            ? fmt::format(", stopping spot finding at {:.2f} A", *rungs[won].d_min)
+                            : std::string(),
+                        score_before, static_cast<int>(validation.size()),
+                        rung_pass[won].score, static_cast<int>(validation.size()));
+            return rung_pass[won];
+        }
+        apply_state(committed);   // back to what this run stands on, not to the defaults
+        return std::nullopt;
+        };
+
         // Find the spots of everything the first pass is certain to want in one go - both schemes'
         // opening frames and the validation set. A batch of workers costs an analysis engine each,
         // which is far more than a frame is to analyse, so one batch for the lot beats one per scheme.
@@ -2900,7 +3469,7 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
             // a halved axis, and 0.12 px is well inside the sigma of any fit that could gate it.
             {
                 const int majority = static_cast<int>(validation.size()) / 2;
-                experiment_.BeamX_pxl(measured_x).BeamY_pxl(measured_y);
+                try_beam_center(measured_x, measured_y);
                 FirstPass alt = pick_best(*indexer_pool, *indexer);
                 const bool header_indexes = best.result.has_value() && best.score > majority;
                 bool measured_indexes = alt.result.has_value() && alt.score > majority;
@@ -2936,8 +3505,65 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                             experiment_.Goniometer(*gonio);
                         }
                     }
+                    // Third coupled unknown: how DEEP the pass reads. A centre 170 px out and a spot
+                    // list too deep to index at ANY centre hide each other exactly as the centre and
+                    // the axis sign do - the measured centre is right, and it is thrown away because
+                    // the full list indexes nothing there either. Measured on one such crystal: the
+                    // file's centre indexed 1/60 and the measured one 0/60, so the file's was kept and
+                    // the run died; with the ladder's lean seed the measured centre indexes 60/60, and
+                    // the run then indexes every frame of the sweep and merges to the deposited
+                    // resolution. So ask the ladder here too, before giving the centre up.
+                    //
+                    // The depth is asked at BOTH centres, and the centre moves only if it is the
+                    // centre that paid. A lean rung at the measured centre scored against the whole
+                    // spot list at the file's changes two things at once, and the count cannot say
+                    // which of them the gain came from - the same reason a trial centre is scored on
+                    // its own spots at all. Measured on one crystal: the measured centre's ladder
+                    // reached 40/60 on a FIVE-fold axis harmonic while the file's own centre reached
+                    // 49/60 on the deposited cell, and the run moved the centre, shipped the
+                    // supercell, and skipped the beam-centre walk that would have found the crystal's
+                    // own. An exact tie keeps the file's centre: nothing then says the centre is wrong.
+                    bool lean = false;
+                    bool deeper_at_home = false;
+                    if (!measured_indexes) {
+                        const FirstPassState before = committed;
+                        restore_beam_center(header_x, header_y);
+                        const auto home = first_pass_ladder(best.score, 1, majority + 1);
+                        const FirstPassState home_state = committed;
+                        committed = before;
+                        apply_state(committed);
+                        try_beam_center(measured_x, measured_y);
+                        const auto away = first_pass_ladder(alt.score, 1, majority + 1);
+                        if (home && (!away || home->score >= away->score)) {
+                            committed = home_state;
+                            restore_beam_center(header_x, header_y);
+                            apply_state(committed);
+                            best = *home;
+                            deeper_at_home = true;
+                            logger.Warning("Beam centre check: reading less of each frame takes the "
+                                           "file's centre to {}/{} validation frames against {}/{} at "
+                                           "the measured centre {:.2f} px away - it is how deep this "
+                                           "run was reading and not the centre, so the centre stays",
+                                           home->score, static_cast<int>(validation.size()),
+                                           away ? away->score : 0,
+                                           static_cast<int>(validation.size()), moved);
+                        } else if (away) {
+                            alt = *away;
+                            measured_indexes = true;
+                            lean = true;
+                        }
+                    }
                     if (measured_indexes) {
-                        if (!joint)
+                        if (lean)
+                            logger.Warning("Beam centre from the background: neither centre indexes the "
+                                           "whole spot list, but at the measured ({:.2f},{:.2f}) the "
+                                           "lean first pass above indexes {}/{} against the file's "
+                                           "{}/{} - the beam centre in this file is wrong, and only a "
+                                           "pass that reads less of each frame could see it",
+                                           measured_x, measured_y, alt.score,
+                                           static_cast<int>(validation.size()), best.score,
+                                           static_cast<int>(validation.size()));
+                        else if (!joint)
                             logger.Warning("Beam centre from the background: the file's ({:.2f},{:.2f}) "
                                            "indexes {}/{} validation frames and the measured "
                                            "({:.2f},{:.2f}) indexes {}/{} - the beam centre in this "
@@ -2946,12 +3572,12 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                                            static_cast<int>(validation.size()), measured_x, measured_y,
                                            alt.score, static_cast<int>(validation.size()));
                         best = alt;
-                    } else {
+                    } else if (!deeper_at_home) {
                         // Nothing worked. Put the file's centre back, so the ladder below searches
                         // around the value the run started with rather than around a fit that has just
                         // been tested and found no better - and so a run that fails for some other
                         // reason fails at the geometry it was given.
-                        experiment_.BeamX_pxl(header_x).BeamY_pxl(header_y);
+                        restore_beam_center(header_x, header_y);
                         logger.Info("Beam centre check: neither the file's centre ({}/{} frames) nor "
                                     "the measured one {:.2f} px away ({}/{}) indexes this run - the "
                                     "file's centre is kept and this is not a beam-centre failure",
@@ -2959,7 +3585,7 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                                     static_cast<int>(validation.size()));
                     }
                 } else {
-                    experiment_.BeamX_pxl(header_x).BeamY_pxl(header_y);
+                    restore_beam_center(header_x, header_y);
                     if (measured_indexes) {
                         // Primitive volumes, as everywhere else here: two passes can find the same
                         // lattice in different settings, and a centred setting's cell is an exact
@@ -3093,8 +3719,9 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
         // (99 % to 25 %), while along it the run keeps 96-100 % indexed and quietly adopts a 2x, 3x or
         // sqrt(3) supercell. The direction that announces itself is not the dangerous one.
         //
-        // Only after a poor pass, so a correct header costs nothing; and spot finding is not repeated,
-        // the cache being keyed by image and the spot POSITIONS not depending on the centre.
+        // Only after a poor pass, so a correct header costs nothing. Every rung re-finds its spots at
+        // its own centre (try_beam_center): the positions do not move with the centre but the list
+        // does, and a rung scored on the file centre's spot list is not a rung the run can adopt.
         if (!cancelled_ && !beam_center_searched_ && config_.beam_center_search_pxl > 0
             && best.score < 0.5 * static_cast<double>(validation.size())) {
             beam_center_searched_ = true;
@@ -3140,11 +3767,30 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                 for (const auto &[dx, dy]: {std::pair<int, int>{-k, 0}, {k, 0}, {0, -k}, {0, k}}) {
                     const float trial_x = beam_x + static_cast<float>(dx);
                     const float trial_y = beam_y + static_cast<float>(dy);
-                    experiment_.BeamX_pxl(trial_x).BeamY_pxl(trial_y);
+                    try_beam_center(trial_x, trial_y);
                     FirstPass alt = pick_best(*indexer_pool, *indexer);
                     logger.Info("Beam-centre hypothesis ({:.2f},{:.2f}): {}/{} frames", trial_x,
                                 trial_y, alt.score, static_cast<int>(validation.size()));
                     seen = std::max(seen, alt.score);
+                    // A rung is not adopted on the count alone. A centre error along the spindle
+                    // translates the derotated cloud rigidly, which the FFT amplitude cannot see, so
+                    // the indexer commits to an axis HARMONIC of the true cell - and a cell twice as
+                    // long indexes MORE frames, not fewer, so the count rewards exactly the answer a
+                    // centre error produces. The same test the scheme comparison already makes:
+                    // primitive volumes differing by a small integer or by sqrt(3). Measured with the
+                    // rungs scored honestly, a rung 1 px away indexed 56/60 on a 4x supercell of the
+                    // lattice the starting centre had already found at 4/60.
+                    const double ratio = best.vol > 0.0 && alt.vol > best.vol ? alt.vol / best.vol : 0.0;
+                    const double nearest = std::round(ratio);
+                    const bool harmonic = (nearest >= 2.0 && std::abs(ratio - nearest) < 0.15)
+                                          || std::abs(ratio - std::sqrt(3.0)) < 0.15;
+                    if (harmonic) {
+                        logger.Info("Beam-centre hypothesis ({:.2f},{:.2f}): its cell is {:.2f}x the "
+                                    "volume of the one the starting centre found, so it is an axis "
+                                    "harmonic and the frame count cannot arbitrate it - not adopted",
+                                    trial_x, trial_y, ratio);
+                        continue;
+                    }
                     if (alt.result.has_value() && alt.score > adopt_bar && alt.score > best.score) {
                         best = alt;
                         won_x = trial_x;
@@ -3162,7 +3808,8 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                     break;
                 }
             }
-            experiment_.BeamX_pxl(won_x).BeamY_pxl(won_y);
+            if (!adopted)
+                restore_beam_center(won_x, won_y);
             if (adopted)
                 logger.Info("Beam centre from indexing: ({:.2f},{:.2f}) -> ({:.2f},{:.2f}), moved "
                             "{:.2f} px, {}/{} validation frames", beam_x, beam_y, won_x, won_y,
@@ -3471,11 +4118,54 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                                    gemmi::crystal_system_str(prepass_result_->search_result.system),
                                    pc.a, pc.b, pc.c, pc.alpha, pc.beta, pc.gamma);
                     best.result = *prepass_result_;
+                    // Pass 1's lattice was FITTED at pass 1's detector distance, and this pass
+                    // integrates at the post-refined one. Re-scoring it here is not the same as
+                    // re-fitting it: a real-space cell is measured against the distance the spots were
+                    // seen at, so carrying it across a distance change scales the whole cell by the
+                    // ratio of the two. Measured on a 545 A axis over 225 -> 226 mm: 0.4 %, exactly
+                    // 225/226, shipped as the run's answer. Scale it to the distance it will be used
+                    // at; the orientation is unaffected.
+                    const float d_fit = prepass_result_->geom.GetDetectorDistance_mm();
+                    const float d_use = experiment_.GetDetectorDistance_mm();
+                    if (d_fit > 0 && d_use > 0 && d_fit != d_use) {
+                        const float f = d_use / d_fit;
+                        const auto &l = best.result->lattice;
+                        best.result->lattice = CrystalLattice(l.Vec0() * f, l.Vec1() * f, l.Vec2() * f);
+                        logger.Info("Two-pass: pass-1's cell was fitted at {:.3f} mm and is used at "
+                                    "{:.3f} mm - scaled by {:.6f} to the distance it is integrated at",
+                                    d_fit, d_use, f);
+                    }
                     best.score  = count_indexed(*indexer, *best.result);   // re-score at the refined geometry
                     best.vol    = std::abs(best.result->lattice
                                           .ToPrimitive(best.result->search_result.centering).CalcVolume());
                     best.name   = "pass-1 lattice (refined-geometry re-index too sparse)";
-                } else {
+                }
+            }
+
+            // The last resort, and ONLY on a run that has no usable lattice: the pass-1 fallback above
+            // has had its turn, and below this the run stops with an error. A run that indexes must
+            // not pay for it - measured, an unguarded call spent 41-76 % of the wall clock on a
+            // healthy dataset evaluating rungs that arithmetically could not be adopted (one crystal
+            // 41 s guarded against 175 s unguarded, same answer).
+            if (best.score < static_cast<int>(validation.size()) / 6) {
+                if (auto rescued = first_pass_ladder(best.score,
+                                                     static_cast<int>(validation.size()) / 6, 0))
+                    best = *rescued;
+            }
+
+            // Whether the run has a lattice at all is decided here, on the pooled spots rather than on
+            // the frame count the rescues above are steered by. A frame count asks each frame to clear
+            // a bar of its own and then counts the frames that did, which measures the spots per frame
+            // as much as the lattice; the pooled fraction asks the whole validation set at once and is
+            // judged against what the same lattice scores at a wrong spindle angle, so a sparse pattern
+            // is refused only when its spots genuinely do not know about the lattice.
+            const PooledEvidence evidence = pooled_evidence(*indexer, *best.result);
+            const double pooled = static_cast<double>(evidence.on_lattice)
+                                  / static_cast<double>(std::max<int64_t>(1, evidence.spots));
+            const double pooled_chance = static_cast<double>(evidence.by_chance)
+                                         / static_cast<double>(std::max<int64_t>(1, evidence.spots));
+            if (!beats_chance(evidence)) {
+                {
                     // Name the cell and Bravais class that was rejected. The commonest cause is a metric
                     // symmetry promoted one class too far - the constrained cell then misses every
                     // reflection by the small angle the constraint snapped away - and without the cell in
@@ -3483,10 +4173,11 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                     const auto &c = best.result->search_result.conventional.GetUnitCell();
                     throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
                                           fmt::format("Two-pass rotation indexing found only a lattice that "
-                                                      "indexes {}/{} validation frames - too few for it to be "
-                                                      "this crystal's lattice. It was {}-centred {}, "
+                                                      "takes {:.1f}% of the validation spots against the "
+                                                      "{:.1f}% a wrong spindle angle takes - it is not this "
+                                                      "crystal's lattice. It was {}-centred {}, "
                                                       "{:.2f} {:.2f} {:.2f} {:.2f} {:.2f} {:.2f}.{}",
-                                                      best.score, static_cast<int>(validation.size()),
+                                                      100.0 * pooled, 100.0 * pooled_chance,
                                                       best.result->search_result.centering,
                                                       gemmi::crystal_system_str(best.result->search_result.system),
                                                       c.a, c.b, c.c, c.alpha, c.beta, c.gamma, next_steps));
@@ -3495,8 +4186,10 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
             indexer->ForceRotationIndexerResult(*best.result);
             logger.Info("First-pass spot finding: {} frames in {} batches, {:.2f} s",
                         spot_cache.size(), prefetch_batches, prefetch_time_s);
-            logger.Info("Two-pass rotation indexing found lattice (scheme '{}': {}/{} validation frames)",
-                        best.name, best.score, static_cast<int>(validation.size()));
+            logger.Info("Two-pass rotation indexing found lattice (scheme '{}': {}/{} validation frames, "
+                        "{}/{} validation spots = {:.1f}% against {:.1f}% at a wrong spindle angle)",
+                        best.name, best.score, static_cast<int>(validation.size()),
+                        evidence.on_lattice, evidence.spots, 100.0 * pooled, 100.0 * pooled_chance);
 
             // The spots in hand were already cut to the budget in force, so the measurement can only
             // shorten a budget, never lengthen one - which is why RunAllPasses hands the second pass the
@@ -3792,6 +4485,10 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
     result.images_processed = finished_count.load();
 
     result.harmonic = HarmonicFromEvidence(harmonic_evidence);
+    result.powder = powder_;
+    result.powder_excluded_from_indexing = !config_.spot_finding.measured_ring_q_recipA.empty();
+    if (result.powder_excluded_from_indexing)
+        result.powder_indexing_d_min_A = config_.spot_finding.high_resolution_limit;
     if (result.harmonic.detected)
         logger.Warning("Higher-order beam contamination: {:.0f}% of the {} unindexed spots this run "
                        "could not put on the lattice are on it at one third the wavelength (the same "
@@ -4300,12 +4997,41 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
             // wants four absences in one zone, and on a 70 A axis that is already at 7 A - while the
             // high-order axial reflections are as numerous as they are uninformative and would dilute
             // exactly the difference this number exists to show.
+            //
+            // Both counts are taken over the reflections this pass's own lattice centring allows, and
+            // that is what makes them the same measurement on the two sides. Each pass merges on its
+            // OWN conventional cell, so a pass that finds a centring the other did not carries the
+            // centring-extinguished half (two thirds, R; three quarters, F) of that cell's reflections
+            // as measured noise: measured, two crystals compare merges holding 2.0x the reflections of
+            // the other, with different axial rows, for no reason but the setting. What both settings
+            // describe is the primitive lattice, and these are its reflections.
+            const auto centring_allows = [c = result.consensus_centering.value_or('P')]
+                    (const MergedReflection &r) {
+                switch (c) {   // rhombohedral is described obverse everywhere in this code
+                    case 'A': return (r.k + r.l) % 2 == 0;
+                    case 'B': return (r.h + r.l) % 2 == 0;
+                    case 'C': return (r.h + r.k) % 2 == 0;
+                    case 'I': return (r.h + r.k + r.l) % 2 == 0;
+                    case 'F': return (r.h + r.k) % 2 == 0 && (r.h + r.l) % 2 == 0;
+                    case 'R': return (-r.h + r.k + r.l) % 3 == 0;
+                    default: return true;
+                }
+            };
             constexpr float AXIAL_ROW_LOW_ORDER_D_A = 4.0f;
             result.search_merge_axial_reflections = std::count_if(
-                    sm.merged.begin(), sm.merged.end(), [](const MergedReflection &r) {
+                    sm.merged.begin(), sm.merged.end(), [&](const MergedReflection &r) {
                         return ((r.h == 0) + (r.k == 0) + (r.l == 0)) == 2
-                               && r.d > AXIAL_ROW_LOW_ORDER_D_A;
+                               && r.d > AXIAL_ROW_LOW_ORDER_D_A && centring_allows(r);
                     });
+            // The signal the pass measured, and the size of the merge it measured it in, which is
+            // what the guard decides on.
+            constexpr float STRONG_I_OVER_SIGMA = 2.0f;
+            result.search_merge_strong_reflections = std::count_if(
+                    sm.merged.begin(), sm.merged.end(), [&](const MergedReflection &r) {
+                        return r.sigma > 0 && r.I / r.sigma >= STRONG_I_OVER_SIGMA && centring_allows(r);
+                    });
+            result.search_merge_reflections = std::count_if(sm.merged.begin(), sm.merged.end(),
+                                                            centring_allows);
         }
 
         // Rotation two-pass geometry pre-pass: this first scale/merge has now fitted a frame-order-smoothed
@@ -4314,14 +5040,23 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
         // apply the detector geometry from this integration. That is all the pre-pass is for: everything
         // the second pass consumes from it is fitted here, and the space group is left to the second pass
         // (see the search gate below).
-        if (geometry_prepass && rsm && experiment_.IsRotationIndexing()) {
+        // postrefine_probe_ brings the post-refinement into a CANONICAL pass as well, where the
+        // pre-pass moved the geometry: the fit it committed was made on reflections integrated at the
+        // geometry BEFORE the move, and whether it has finished walking can only be asked of
+        // reflections integrated at the geometry after it. The probe measures - it applies nothing and
+        // leaves the smoothed mosaicity and the pre-pass lattice alone, which stay pass 1's for every
+        // pass that consumes them; RunAllPasses decides what to do with the answer.
+        if ((geometry_prepass || postrefine_probe_) && rsm && experiment_.IsRotationIndexing()) {
             const auto &outcomes = indexer->GetIntegrationOutcome();
-            prepass_mosaicity_.assign(outcomes.size(), NAN);
-            for (size_t o = 0; o < outcomes.size(); ++o)
-                if (outcomes[o].mosaicity_deg) prepass_mosaicity_[o] = *outcomes[o].mosaicity_deg;
+            if (geometry_prepass) {
+                prepass_mosaicity_.assign(outcomes.size(), NAN);
+                for (size_t o = 0; o < outcomes.size(); ++o)
+                    if (outcomes[o].mosaicity_deg) prepass_mosaicity_[o] = *outcomes[o].mosaicity_deg;
+            }
             if (result.consensus_cell.has_value()) {
                 if (const auto rot = indexer->FinalizeRotationIndexing(); rot && rot->axis) {
-                    prepass_result_ = *rot;   // full result (lattice+geom+axis), for the supercell fallback
+                    if (geometry_prepass)
+                        prepass_result_ = *rot;   // full result (lattice+geom+axis), for the supercell fallback
                     PostRefineSettings prs;
                     prs.crystal_system = rot->search_result.system;
                     prs.num_threads = static_cast<int>(config_.nthreads);
@@ -4353,14 +5088,16 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                             rot->geom.GetPoniRot1_rad(),
                             rot->geom.GetPoniRot2_rad()};
                         logger.Info("Two-pass: post-refined detector geometry (distance {:.3f} mm, "
-                                    "beam {:.2f},{:.2f} px, tilt {:.4f},{:.4f} deg) will drive the "
-                                    "second integration pass",
+                                    "beam {:.2f},{:.2f} px, tilt {:.4f},{:.4f} deg) - {}",
                                     pr.distance_after_mm, pr.beam_x_after_px, pr.beam_y_after_px,
                                     rot->geom.GetPoniRot1_rad() * 180.0 / PI,
-                                    rot->geom.GetPoniRot2_rad() * 180.0 / PI);
+                                    rot->geom.GetPoniRot2_rad() * 180.0 / PI,
+                                    geometry_prepass ? "it will drive the second integration pass"
+                                                     : "what the fit still asks for at the geometry "
+                                                       "this pass ran at");
                     } else {
-                        logger.Info("Two-pass: geometry post-refine committed no detector change "
-                                    "- the second pass reproduces the first");
+                        logger.Info("Two-pass: geometry post-refine committed no detector change{}",
+                                    geometry_prepass ? " - the second pass reproduces the first" : "");
                     }
                     // DECISION POINT for the goniometer rotation scale. It does not ride on pr.ok - the
                     // scale is its own cross-validated fit and the crystals that have a stage fault are
@@ -4370,7 +5107,10 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                     // would silently damage it, so the asymmetry is deliberate: committed only when the
                     // fit is both cross-validated and outside the tolerance. A manual --rotation-scale is
                     // already on the goniometer and is left alone.
-                    if (pr.rotation_scale_suspect && !config_.rotation_scale.has_value())
+                    // Only the pre-pass fits the rotation scale. It is applied from the goniometer
+                    // the file came with, so a scale measured again on angles that have already been
+                    // corrected once is not a correction that can be applied on top of that one.
+                    if (pr.rotation_scale_suspect && !config_.rotation_scale.has_value() && geometry_prepass)
                         prepass_rotation_scale_ = static_cast<float>(pr.rotation_scale);
                 }
             }
@@ -4541,8 +5281,9 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                         "Space group is AMBIGUOUS between {} and {} (point groups {} and {}, the same "
                         "order): the merge of all observations and the merge of only the well-measured "
                         "ones each support one of them, and neither is the higher symmetry, so the data "
-                        "do not decide. Processing continues in {} (the all-observation choice) - try "
-                        "BOTH in molecular replacement, or re-run with -S {} to force the other one.",
+                        "do not decide. Processing continues in {} (the all-observation choice); "
+                        "molecular replacement in both is what settles it, and a re-run with -S {} "
+                        "forces the other one.",
                         a, b, alt.point_group_hm, sg_search.point_group_hm, a, b);
                     logger.Warning("{}", msg);
                     stats_text << "  !! " << msg << "\n\n";
@@ -5116,6 +5857,109 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                     logger.Info("{}", msg);
                     stats_text << "  " << msg << "\n\n";
                 }
+                // The group has to be able to DESCRIBE the cell it is adopted on, and where the
+                // promotion was made HERE it cannot. A two-fold the intensities confirm is one the spot
+                // positions never offered - the Bravais class is decided on the unrefined indexing
+                // candidate, and the free refinement can walk into a class afterwards - so no fit under
+                // this group's constraint has ever been run, and what goes to the report, the master
+                // file and the MTZ is the free fit's metric re-expressed in the group's setting: a
+                // C 1 2 1 whose alpha is 88.5, which no monoclinic refinement could have produced. Ask
+                // the spots what cell the constraint supports; where they refuse it, report the metric
+                // the group fixes rather than one it cannot describe. A lattice already refined under
+                // this class leaves only float noise behind and is left alone, which is what the bound
+                // tests - so a de-novo run whose indexing found the class behaves exactly as it did.
+                {
+                    std::optional<CrystalLattice> &adopted =
+                            commit_reindex ? commit_lattice : end_msg.rotation_lattice;
+                    // The band between the two bounds is where the cell is merely UNCONSTRAINED. Above
+                    // the upper one it is the wrong cell for this group - the axes permuted, the fold
+                    // running along an axis the group does not put it on - and nothing here can repair
+                    // that: a constrained refit has no cell to find and the metric projection would
+                    // manufacture one, turning a visible mismatch into a plausible-looking lie. That
+                    // case is refused where the group comes in (MAX_METRIC_VIOLATION), and is left
+                    // exactly as it is here.
+                    const double violation = adopted.has_value()
+                            ? MetricViolation(adopted->GetUnitCell(), sg) : 0.0;
+                    if (adopted.has_value() && violation > MAX_CONSTRAINED_METRIC_NOISE
+                        && violation <= MAX_METRIC_VIOLATION) {
+                        const UnitCell before = adopted->GetUnitCell();
+                        const auto refit = indexer->RefineRotationLatticeConstrained(*adopted,
+                                                                                     sg.crystal_system());
+                        // A refit is usable only when the constraint it was written in is the one this
+                        // group needs: XtalResidual parameterises monoclinic with the unique axis along
+                        // b, and the search can adopt a group that puts it elsewhere (C 1 1 2), whose
+                        // metric such a fit does not satisfy. Ask the group, rather than enumerate the
+                        // settings - a fit made in the right constraint lands at float noise.
+                        const bool fits_group = refit.has_value()
+                                && MetricViolation(refit->lattice.GetUnitCell(), sg)
+                                   <= MAX_CONSTRAINED_METRIC_NOISE;
+                        // ...and the spots have to keep it. Half is the bar the indexer's own
+                        // pseudo-symmetry guard uses for this very comparison: a constrained cell that
+                        // indexes half of what the free one did is not describing these images, and the
+                        // metric and the intensities are then saying different things - which is a
+                        // geometry error to go and find, not a cell to report.
+                        const bool spots_keep_it = refit.has_value()
+                                && refit->indexed_fraction > 0.5f * refit->indexed_fraction_before;
+                        if (fits_group && spots_keep_it) {
+                            *adopted = refit->lattice;
+                            const UnitCell uc = adopted->GetUnitCell();
+                            logger.Info("{} was adopted on a cell no fit under it had produced (the "
+                                        "promotion was made after integration, on the freely refined "
+                                        "metric). Re-refined under the constraint: a={:.3f} b={:.3f} "
+                                        "c={:.3f} alpha={:.2f} beta={:.2f} gamma={:.2f}, from a={:.3f} "
+                                        "b={:.3f} c={:.3f} alpha={:.2f} beta={:.2f} gamma={:.2f} - it "
+                                        "indexes {:.1f} % of the accumulated spots against {:.1f} % for "
+                                        "the free cell.",
+                                        sg.xhm(), uc.a, uc.b, uc.c, uc.alpha, uc.beta, uc.gamma,
+                                        before.a, before.b, before.c, before.alpha, before.beta,
+                                        before.gamma, 100.0 * refit->indexed_fraction,
+                                        100.0 * refit->indexed_fraction_before);
+                        } else {
+                            *adopted = SymmetrizeMetric(*adopted, sg);
+                            const UnitCell uc = adopted->GetUnitCell();
+                            const std::string msg = fmt::format(
+                                "The cell {} was adopted on is one that group cannot describe - "
+                                "a={:.3f} b={:.3f} c={:.3f} alpha={:.2f} beta={:.2f} gamma={:.2f}, "
+                                "refined FREE, because the symmetry was confirmed from the intensities "
+                                "after integration and no constrained fit had produced this lattice. {} "
+                                "The reported cell is the nearest metric the group fixes (alpha={:.2f} "
+                                "beta={:.2f} gamma={:.2f}); the reflections are unchanged. A deviation "
+                                "this size is not refinement noise - the geometry the images were "
+                                "integrated at is the place to look.",
+                                sg.xhm(), before.a, before.b, before.c, before.alpha, before.beta,
+                                before.gamma,
+                                refit.has_value()
+                                    ? (fits_group
+                                       ? fmt::format("Re-refining under the constraint indexes {:.1f} % "
+                                                     "of the accumulated spots against {:.1f} % free, so "
+                                                     "it was refused.",
+                                                     100.0 * refit->indexed_fraction,
+                                                     100.0 * refit->indexed_fraction_before)
+                                       : "The constrained refinement is not written in this group's "
+                                         "setting, so it could not be asked.")
+                                    : "There was no rotation spot cloud to re-refine against.",
+                                uc.alpha, uc.beta, uc.gamma);
+                            logger.Warning("{}", msg);
+                            stats_text << "  !! " << msg << "\n\n";
+                        }
+                        // Carry the corrected lattice into the cell that is reported and merged on.
+                        // Where a reindex is pending the block below does that and re-ingests; where
+                        // there is none, this is the only place it happens.
+                        if (commit_reindex) {
+                            commit_cell = adopted->GetUnitCell();
+                        } else {
+                            result.consensus_cell = adopted->GetUnitCell();
+                            end_msg.unit_cell = result.consensus_cell;
+                            if (rsm) {
+                                rsm.emplace(experiment_, indexer->GetIntegrationOutcome(),
+                                            result.consensus_cell, static_cast<int>(config_.scaling_iter),
+                                            config_.nthreads, logger, config_.observation_dump_path);
+                                rsm->Ingest();
+                            }
+                        }
+                    }
+                }
+
                 // A reindex is committed only when the intensity re-test confirmed a higher symmetry in a
                 // centred setting: bring the integrated reflections + cell into that setting and re-ingest
                 // the rotation merge, so the final scaling/merging folds the equivalents correctly.
@@ -5144,9 +5988,141 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                 end_msg.space_group_name = sg.xhm();
                 end_msg.space_group_number = static_cast<uint64_t>(sg.number);
                 result.space_group = sg;
-                WarnIfMetricHostsMoreSymmetry(result.consensus_cell, sg);
                 phase("Re-scaling in space group " + sg.short_name());
                 sm = scale_and_merge(sg.short_name(), false);
+
+                // A promotion the operator correlations CONFIRMED and Stage A then refused, put to
+                // the merge. Every gate that can refuse one is a ratio against another operator or
+                // against the noise floor, and both references are properties of how the crystal was
+                // mounted rather than of its symmetry: a 2-fold within a degree of the spindle
+                // records its mates on the same detector pixel half a turn later, carries no
+                // geometry-dependent systematic at all, and by being that clean makes every other
+                // operator look bad; and the best-agreeing operator anywhere can be one of the
+                // operators under test, which collapses the ratio on worse data and raises it on
+                // better. So ask the data the question those ratios stand in for - merge under the
+                // refused group and see whether the reflections it folds together agree.
+                //
+                // R_meas is multiplicity-corrected, so a merge that averaged non-equivalent
+                // reflections has to inflate it, and the error model is refitted per merge, so ISa
+                // says whether the extra multiplicity was bought with systematic disagreement. Over
+                // six refused promotions the two signs separate completely: the genuine ones leave
+                // both flat or better, the false ones inflate R_meas by 21-99% and drop ISa. CC1/2
+                // and <I/sigma> do NOT separate them - both RISE on a false promotion too, which
+                // gains multiplicity either way - so the rule is read on R_meas and ISa and nothing
+                // else.
+                //
+                // Both arms are merged over the SAME resolution range, the one the adopted group's
+                // own merge chose: left to pick their own cutoffs the two are not the same
+                // measurement and the separation muddies to a couple of percent with the sign lost.
+                // Rotation only - it is the rotation merge that can be re-cut between merges.
+                if (rsm && sg_search.refused_point_group_representative.has_value()) {
+                    // Which group the comparison arm merges in. The point group is the refused one -
+                    // passed as its representative, because gemmi calls both P321 and P312 "32" - and
+                    // the absence classes are the adopted group's, because Stage B is asked for the
+                    // group on the adopted merge, where those classes are already empty. That is what
+                    // makes the two arms differ by the added ROTATIONS alone.
+                    SearchSpaceGroupOptions hi_opts = sg_opts;
+                    hi_opts.fixed_point_group = sg_search.refused_point_group_representative;
+                    hi_opts.merge_isa = result.error_model_isa;
+                    if (result.consensus_cell.has_value())
+                        hi_opts.cell = gemmi::UnitCell(*result.consensus_cell);
+                    if (end_msg.rotation_lattice_type.has_value())
+                        hi_opts.lattice_system = end_msg.rotation_lattice_type->crystal_system;
+                    const auto hi_search = SearchSpaceGroup(sm.merged, hi_opts);
+                    // ...and its CENTRING is taken rather than read. The adopted group has already
+                    // removed its centring-absent class from this merge, so that class holds no data,
+                    // every candidate of the point group is equally consistent with it, and the
+                    // tie-break takes the lowest-numbered - which is the primitive one. Merging in
+                    // that would hand the higher arm the centring-absent reflections as if they were
+                    // data and lose the comparison on noise. Same move the metric-lattice ask makes.
+                    std::optional<gemmi::SpaceGroup> hi_sg;
+                    if (hi_search.best_space_group.has_value()
+                        && hi_search.best_space_group->centring_type() == sg.centring_type())
+                        hi_sg = hi_search.best_space_group;
+                    else
+                        for (const auto &alt : hi_search.alternatives)
+                            if (alt.centring_type() == sg.centring_type()) { hi_sg = alt; break; }
+                    if (hi_sg.has_value()) {
+                        // scale_and_merge reports the error model of whatever it merged, and the two
+                        // comparison merges are not the run's answer, so it goes back if they lose.
+                        const double em_isa = result.error_model_isa;
+                        const double em_isa_asymptotic = result.error_model_isa_asymptotic;
+                        const double em_a = result.error_model_a;
+                        const double em_b = result.error_model_b;
+                        const auto res_fit = result.resolution_fit_A;
+                        const auto manual_d_min =
+                                experiment_.GetScalingSettings().GetHighResolutionLimit_A();
+                        phase("Merging under the refused point group "
+                              + sg_search.refused_point_group_hm);
+                        rsm->SetDMinLimit(sm.statistics.overall.d_min);
+                        const auto low = scale_and_merge(sg.short_name() + ", pinned", false);
+                        const double low_isa = result.error_model_isa;
+                        experiment_.SetSpaceGroup(*hi_sg);
+                        const auto high = scale_and_merge(hi_sg->short_name() + ", pinned", false);
+                        const double high_isa = result.error_model_isa;
+                        rsm->SetDMinLimit(manual_d_min);
+                        const double low_r = low.statistics.overall.r_meas;
+                        const double high_r = high.statistics.overall.r_meas;
+                        const auto mult = [](const MergeStatisticsShell &o) {
+                            return o.unique_reflections > 0
+                                   ? static_cast<double>(o.total_observations) / o.unique_reflections
+                                   : 0.0;
+                        };
+                        const std::string measured = fmt::format(
+                                "R_meas {:.4f} -> {:.4f}, ISa {:.2f} -> {:.2f}, multiplicity {:.2f} "
+                                "-> {:.2f}, both merged to {:.2f} A",
+                                low_r, high_r, low_isa, high_isa, mult(low.statistics.overall),
+                                mult(high.statistics.overall), sm.statistics.overall.d_min);
+                        // Neither statistic may get worse. A NaN on either side answers "worse",
+                        // which is the recoverable direction: the run keeps the group it already has.
+                        if (high_r <= low_r && high_isa >= low_isa) {
+                            const std::string msg = fmt::format(
+                                    "Point group {} was confirmed by the operator correlations and "
+                                    "then refused ({}), so both groups were merged and compared: {}. "
+                                    "Merging under it does not degrade the data, which folding "
+                                    "non-equivalent reflections together cannot manage, so {} is "
+                                    "adopted.",
+                                    sg_search.refused_point_group_hm, sg_search.refused_reason,
+                                    measured, hi_sg->xhm());
+                            logger.Info("{}", msg);
+                            stats_text << "  " << msg << "\n\n";
+                            sg_search = hi_search;
+                            // Leave the candidate it displaced among the alternatives, so the
+                            // reported "or ..." list stays the set of groups the data cannot
+                            // separate, each named once - as the metric-lattice ask does.
+                            if (hi_search.best_space_group->number != hi_sg->number) {
+                                sg_search.alternatives.push_back(*hi_search.best_space_group);
+                                std::erase_if(sg_search.alternatives,
+                                              [&](const gemmi::SpaceGroup &a) {
+                                                  return a.number == hi_sg->number;
+                                              });
+                            }
+                            sg_search.best_space_group = *hi_sg;
+                            result.space_group = *hi_sg;
+                            end_msg.space_group_name = hi_sg->xhm();
+                            end_msg.space_group_number = static_cast<uint64_t>(hi_sg->number);
+                            promoted_point_group = true;
+                            phase("Re-scaling in space group " + hi_sg->short_name());
+                            sm = scale_and_merge(hi_sg->short_name(), false);
+                        } else {
+                            logger.Info("Point group {} was refused ({}), and merging under it "
+                                        "agrees: {}. Keeping {}.", sg_search.refused_point_group_hm,
+                                        sg_search.refused_reason, measured, sg.xhm());
+                            sg_search.refused_reason +=
+                                    ", and merging under it makes the data worse (" + measured + ")";
+                            experiment_.SetSpaceGroup(sg);
+                            result.error_model_isa = em_isa;
+                            result.error_model_isa_asymptotic = em_isa_asymptotic;
+                            result.error_model_a = em_a;
+                            result.error_model_b = em_b;
+                            result.resolution_fit_A = res_fit;
+                        }
+                    }
+                }
+                // After the arbitration, so a promoted run is not told that the metric hosts more
+                // symmetry than a group it no longer has.
+                WarnIfMetricHostsMoreSymmetry(result.consensus_cell,
+                                              result.space_group.value_or(gemmi::get_spacegroup_p1()));
             }
             result.space_group_search = sg_search;
         } else {
@@ -5297,9 +6273,9 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                             "measured point group cannot map that part of the sweep's blind cone "
                             "onto measured territory, however long the sweep runs. The loss is a "
                             "coherent cap about the spindle direction rather than a scatter, so "
-                            "overall completeness may still look reasonable - check it near the "
-                            "spindle. A second sweep about a different axis, or re-mounting, "
-                            "recovers it.",
+                            "overall completeness may still look reasonable while the gap sits at "
+                            "the spindle direction. A second sweep about a different axis, or "
+                            "re-mounting, recovers it.",
                             100.0 * loss->lost_unique_fraction);
                         logger.Warning("{}", msg);
                         stats_text << "  !! " << msg << "\n\n";
@@ -5338,7 +6314,7 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
                         "Indexing ambiguity: this cell / space group admits alternative indexing "
                         "(reindex operator(s): {}). {} are indexed in one hand at random, and rugnux can only "
                         "break this against an external reference. WITHOUT one the merge mixes the hands and "
-                        "CC1/2 is degraded - supply a reference MTZ (-z) or a model ({}) to resolve it.",
+                        "CC1/2 is degraded; a reference MTZ (-z) or a model ({}) resolves it.",
                         laws, experiment_.IsRotationIndexing() ? "Lattices" : "Serial-stills crystals",
                         experiment_.IsRotationIndexing() ? "--model" : "--model, which needs -C and -S here");
                     logger.Warning("{}", msg);
@@ -5400,16 +6376,26 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
 
         // Per-image form of the sweep-quality ranges, for the _process.h5: one code per image, 0 where
         // the image is in no flagged range, plus the vocabulary the codes index. Only filled when the
-        // diagnostic ran, so absent datasets mean "not looked for" rather than "all clean".
+        // diagnostic ran, so absent datasets mean "not looked for" rather than "all clean". The
+        // disposition rides alongside as a second per-image array: what the reason SAW and what became
+        // of the frame are different statements, and a consumer needs both.
         if (sm.statistics.sweep_quality.measured) {
+            const auto &sq = sm.statistics.sweep_quality;
             end_msg.sweep_quality.assign(end_msg.max_image_number, 0);
-            for (const auto &r : sm.statistics.sweep_quality.ranges)
+            for (const auto &r : sq.ranges)
                 for (int64_t i = std::max<int64_t>(0, r.first_image);
                      i <= r.last_image && i < static_cast<int64_t>(end_msg.sweep_quality.size()); ++i)
                     end_msg.sweep_quality[i] = static_cast<uint8_t>(r.reason) + 1;
-            for (int r = 0; r <= static_cast<int>(SweepQualityReason::RadiationDamage); ++r)
+            for (int r = 0; r <= static_cast<int>(SweepQualityReason::InconsistentWithMerge); ++r)
                 end_msg.sweep_quality_reasons.emplace_back(
                         SweepQualityReasonCode(static_cast<SweepQualityReason>(r)));
+            end_msg.frame_disposition.assign(
+                    sq.frame_disposition.begin(),
+                    sq.frame_disposition.begin()
+                            + std::min<int64_t>(end_msg.max_image_number, sq.frame_disposition.size()));
+            for (int d = 0; d <= static_cast<int>(FrameDisposition::Rejected); ++d)
+                end_msg.frame_disposition_codes.emplace_back(
+                        FrameDispositionCode(static_cast<FrameDisposition>(d)));
         }
         {
             // Stride rather than take the head: the merged list is ordered by hkl, so the first N
@@ -5498,30 +6484,47 @@ ProcessResult Rugnux::RunPipeline(RugnuxObserver *observer, bool write_output, b
             }
 
             // Sweep-quality report: the stretches of the sweep over which the crystal delivered much
-            // less than the rest of the run, and what each one looks like. Nothing is excluded because
-            // of it - the frames still carry signal, and this is a message for the beamline, not a
-            // filter. Frame numbers are processed-image ordinals, inclusive, as in <prefix>_image.dat.
+            // less than the rest of the run, what each one looks like, what became of it and what
+            // keeping it costs the merged intensities. Frame numbers are processed-image ordinals,
+            // inclusive, as in <prefix>_image.dat.
             const auto &sq = sm.statistics.sweep_quality;
             if (sq.measured) {
+                const int n_sweep = sq.frames_merged + sq.frames_downgraded + sq.frames_rejected;
+                auto pct = [&](int n) { return n_sweep > 0 ? 100.0 * n / n_sweep : 0.0; };
                 std::ostringstream os;
                 os << fmt::format("Sweep quality over {:.0f} deg (per-image scale with the incident flux, "
                                   "which varied {:.2f}x, already divided out):\n",
                                   sq.sweep_deg, sq.flux_peak_to_trough);
+                os << fmt::format("     {} frames: {} merged ({:.1f}%), {} downgraded ({:.1f}%), "
+                                  "{} rejected ({:.1f}%, {:.1f} deg)\n",
+                                  n_sweep, sq.frames_merged, pct(sq.frames_merged),
+                                  sq.frames_downgraded, pct(sq.frames_downgraded),
+                                  sq.frames_rejected, pct(sq.frames_rejected), sq.rejected_deg);
                 if (sq.ranges.empty()) {
                     os << "     no stretch of the sweep is materially worse than the run";
                 } else {
-                    os << "     frames              rotation  diagnosis        severity scale    CC indexed\n";
+                    os << "     frames              rotation  diagnosis        severity scale    CC indexed  disposition  dCC1/2\n";
                     for (const auto &r : sq.ranges)
-                        os << fmt::format("     {:<17s} {:6.1f} deg  {:<16s}    {:5.2f} {:5.2f} {:5.2f}   {:4.0f}%\n",
+                        os << fmt::format("     {:<17s} {:6.1f} deg  {:<16s}    {:5.2f} {:5.2f} {:5.2f}   {:4.0f}%  {:<11s}  {}\n",
                                           fmt::format("{}-{}", r.first_image, r.last_image), r.rotation_deg,
                                           SweepQualityReasonText(r.reason), r.severity, r.mean_relative_scale,
-                                          r.mean_relative_cc, 100.0 * r.indexed_fraction);
+                                          r.mean_relative_cc, 100.0 * r.indexed_fraction,
+                                          FrameDispositionCode(r.disposition),
+                                          std::isfinite(r.delta_cc_half)
+                                                  ? fmt::format("{:+.4f} +/- {:.4f}", r.delta_cc_half,
+                                                                r.delta_cc_half_se)
+                                                  : std::string("-"));
                     os << "   => severity is the fraction of the run's typical diffracting power missing "
-                          "over the range";
+                          "over the range; dCC1/2 is what keeping it costs the merged intensities";
                     if (sq.modulation_peak_to_trough >= 1.05f)
                         os << fmt::format("\n   => once-per-revolution modulation of the per-image scale: "
                                           "{:.1f}x peak to trough", sq.modulation_peak_to_trough);
                 }
+                if (!sq.delta_cc_half_batch.empty()) {
+                    os << fmt::format("\n   => delta-CC1/2 per {:.0f} deg:", sq.delta_cc_half_batch_deg);
+                    for (float d : sq.delta_cc_half_batch)
+                        os << (std::isfinite(d) ? fmt::format(" {:+.3f}", d) : std::string(" -"));
+                }
                 logger.Info("{}", os.str());
             }
         }
diff --git a/rugnux/Rugnux.h b/rugnux/Rugnux.h
index 1da6a0787..8365b84e1 100644
--- a/rugnux/Rugnux.h
+++ b/rugnux/Rugnux.h
@@ -16,6 +16,7 @@
 #include "../common/JFJochMessages.h"        // DataMessage
 #include "../common/JFJochReceiverPlots.h"   // MeanProcessingTime
 #include "../image_analysis/spot_finding/SpotFindingSettings.h"
+#include "../image_analysis/spot_finding/SpotUtils.h"   // PowderRings
 #include "../image_analysis/scale_merge/Merge.h"   // MergeStatistics
 #include "../image_analysis/scale_merge/TwinningAnalysis.h"   // TwinningAnalysisResult
 #include "../image_analysis/scale_merge/TranslationalNCS.h"   // TranslationalNCSResult
@@ -259,9 +260,14 @@ struct ProcessResult {
     double search_merge_cc_half = NAN;
     // How many reflections that merge holds on the three principal axial rows (h00, 0k0, 00l), at
     // low order. These are the reflections whose systematic absences decide the screw axes, they
-    // number a few dozen against the merge's tens of thousands, and CC1/2 therefore cannot see them
-    // at all - which is why the two-pass quality guard counts them separately.
+    // number a few dozen against the merge's tens of thousands, and a bulk statistic therefore cannot
+    // see them at all - which is why the two-pass quality guard counts them separately.
     int64_t search_merge_axial_reflections = 0;
+    // How much signal that merge holds: reflections at I/sigma >= 2, and how many reflections it holds
+    // at all. This is what the two-pass quality guard compares the passes on - see RefinedPassIsWorse
+    // for why it is these and not CC1/2.
+    int64_t search_merge_strong_reflections = 0;
+    int64_t search_merge_reflections = 0;
 
     // Per-reflection (I, sigma) of the final merged reflections, for the ISa diagnostic: I/sigma
     // plotted against I flattens off at the asymptote the error model reports as ISa, so the plot shows
@@ -285,6 +291,13 @@ struct ProcessResult {
     // Higher-order contamination of the beam, read off the spots the lattice did not take. Measured
     // on the images themselves, so it is there whether or not anything merged.
     HarmonicContaminationResult harmonic;
+    // Powder contamination measured in the pre-scan: a crystalline phase other than the crystal,
+    // diffracting as rings among its reflections. Measured and reported on every run.
+    PowderRings powder;
+    // Whether this run acted on it - left the rings out of indexing - and the resolution it stopped
+    // the indexing spot list at where it did.
+    bool powder_excluded_from_indexing = false;
+    std::optional<float> powder_indexing_d_min_A;
 
     // The same analysis measured BEFORE the space group was decided, on the subgroup merge the search
     // was given. It is the only twinning number a promotion cannot contaminate: once a higher Laue
@@ -369,6 +382,14 @@ double MetricViolation(const UnitCell &uc, const gemmi::SpaceGroup &sg);
 // 113 runs if it were used here.
 constexpr double MAX_METRIC_VIOLATION = 0.1;
 
+// What a cell refined UNDER a group's own constraint leaves of that group's metric violation: float
+// rounding on the lattice vectors, and nothing else (the constraint holds the angles at 90 exactly,
+// so the residue is 1e-6 and below). A cell scoring above this was refined under something else -
+// which is what has happened wherever the group was adopted AFTER integration, on a metric no
+// constrained fit ever produced. Two orders below MAX_METRIC_VIOLATION, which bounds a cell that is
+// WRONG for its group rather than merely unconstrained: the first says re-refine, the second refuse.
+constexpr double MAX_CONSTRAINED_METRIC_NOISE = 1e-3;
+
 // Callbacks for progress and live results. Methods may be called from worker threads, so an
 // implementation must be thread-safe. The default no-ops suit the CLIs.
 class RugnuxObserver {
@@ -414,6 +435,13 @@ class Rugnux {
     // force_rotation_result_), so it integrates on the correct cell with pass-1's refined orientation/axis - a
     // lattice-only force loses that metadata and integrates markedly worse.
     std::optional<RotationIndexerResult> prepass_result_;
+    // What the pre-scan measured about powder contamination - a crystalline phase other than the
+    // crystal, diffracting as rings. Measured on every run and reported whatever it says; acted on
+    // only where a pass that failed indexes better with the rings set aside.
+    PowderRings powder_;
+    // Resolutions a quarter and a half of the pre-scan's spots lie coarser than. Rungs of the
+    // first-pass ladder: they say how DEEP a pass reads without a resolution written into the program.
+    std::vector<float> prescan_spot_quantile_d_A_;
 
     // Set by Run()'s supercell-collapse guard to force pass-1's full result into the second-pass indexer
     // (RunPipeline calls indexer->ForceRotationIndexerResult when this is set); reset right after that re-run.
@@ -481,6 +509,11 @@ class Rugnux {
     // of itself as soon as its search merge is in, which is where it learns that its report and its
     // files are about to be superseded.
     std::optional<ProcessResult> quality_guard_pass1_;
+    // Whether a canonical pass also MEASURES the post-refinement (it never applies it). The fit the
+    // pre-pass committed was made on reflections integrated at the geometry before the move, so
+    // whether it has finished walking is a question only reflections integrated after the move can
+    // answer; RunAllPasses turns this on for the passes that answer it.
+    bool postrefine_probe_ = false;
 
     // Pre-scan: read a spread sample of frames and take three things off them - the shadow of the beam
     // stop and its holder, added to the pixel mask (config_.detect_beam_stop), the beam centre
diff --git a/rugnux/rugnux_cli.cpp b/rugnux/rugnux_cli.cpp
index b6d80be07..f9dee7f57 100644
--- a/rugnux/rugnux_cli.cpp
+++ b/rugnux/rugnux_cli.cpp
@@ -132,7 +132,7 @@ void print_usage() {
     std::cout << "   --force-still                    Process a rotation (goniometer) dataset as independent stills (still indexing + per-image ScaleOnTheFly) instead of rotation" << std::endl;
     std::cout << "   -R, --two-pass-rotation[=num]    Two-pass offline rotation indexing (default for goniometer data; optional first-pass image count, default: 100)" << std::endl;
     std::cout << "   --single-pass-rotation[=num]     Use online-like single-pass rotation indexing (optional: min angular range deg)" << std::endl;
-    std::cout << "   --min-indexed-spots <num>        Spots a frame must have on the lattice before it counts as indexed (default: 6). The rotation first pass scores candidate lattices on that count, so on a pattern with fewer spots per frame no lattice can score and the run gives up; integration itself is not gated by it" << std::endl;
+    std::cout << "   --min-indexed-spots <num>        Spots a frame must have on the lattice before it counts as indexed (default: 6, minimum 4). It sets the reported indexing rate and the count the rotation first pass ranks candidate lattices by; whether the run has a lattice at all is decided on the pooled spots instead, and integration is not gated by it" << std::endl;
     std::cout << "   --force-rotation-lattice <vec>   Force rotation indexer with external lattice (in Angstrom) : \"a0x,a0y,a0z,a1x,a1y,a1z,a2x,a2y,a2z\" (9 floats, skips first pass)" << std::endl;
     std::cout << "   --rotation-scale <k>             Goniometer rotation scale: the stage turned k times the angle stored in the file (the commanded one). Applied to both passes; overrides the fitted correction" << std::endl;
     std::cout << "   --rotation-no-postrefine         Disable the (default-on) two-pass rotation post-refine (post-refine detector distance/beam + cell/axis, then re-integrate; only the refined pass is written, as the canonical <prefix>_* output)" << std::endl;
diff --git a/tests/BeamCenterFFTGPUTest.cpp b/tests/BeamCenterFFTGPUTest.cpp
new file mode 100644
index 000000000..16431a698
--- /dev/null
+++ b/tests/BeamCenterFFTGPUTest.cpp
@@ -0,0 +1,278 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include <catch2/catch_all.hpp>
+#include "../common/CUDAWrapper.h"
+
+#ifdef JFJOCH_USE_CUDA
+
+#include <cmath>
+#include <cstdint>
+#include <limits>
+#include <random>
+#include <vector>
+
+#include "../image_analysis/geom_refinement/BeamCenterFFTCPU.h"
+#include "../image_analysis/geom_refinement/BeamCenterFFTGPU.h"
+
+namespace {
+
+// An isotropic scattered background about (cx, cy) with a solvent ring, a module gap and a darker
+// sextant - the same shape of image the corpus measurement runs on, at a size a test can afford.
+std::vector<float> SynthesiseBackground(int64_t w, int64_t h, float cx, float cy) {
+    std::vector<float> mean(static_cast<size_t>(w * h), NAN);
+    std::mt19937 rng(20260913);
+    std::normal_distribution<float> gauss(0.0f, 1.0f);
+    for (int64_t y = 0; y < h; y++) {
+        if (y >= 500 && y < 520)
+            continue;   // module gap
+        for (int64_t x = 0; x < w; x++) {
+            const float r = std::hypot(static_cast<float>(x) - cx, static_cast<float>(y) - cy);
+            const float t = (r - 330.0f) / 40.0f;
+            float value = 130.0f * std::exp(-r / 260.0f) + 50.0f * std::exp(-0.5f * t * t) + 6.0f;
+            const float phi = std::atan2(static_cast<float>(y) - cy, static_cast<float>(x) - cx);
+            if (phi > 0.0f && phi < 1.0f)
+                value *= 0.8f;
+            mean[static_cast<size_t>(y * w + x)] = value + gauss(rng) * std::sqrt(value / 60.0f);
+        }
+    }
+    return mean;
+}
+
+void CompareShortlist(const std::vector<BeamCenterFFTCandidate> &gpu,
+                      const std::vector<BeamCenterFFTCandidate> &cpu, const char *what) {
+    INFO(what);
+    REQUIRE(gpu.size() == cpu.size());
+    for (size_t i = 0; i < cpu.size(); i++) {
+        INFO("candidate " << i);
+        // The positions are what a caller consumes, and they are a grid index: they must be the
+        // same index, not a nearby one.
+        CHECK(((gpu[i].beam_x_pxl == cpu[i].beam_x_pxl)
+               || (std::isnan(gpu[i].beam_x_pxl) && std::isnan(cpu[i].beam_x_pxl))));
+        CHECK(((gpu[i].beam_y_pxl == cpu[i].beam_y_pxl)
+               || (std::isnan(gpu[i].beam_y_pxl) && std::isnan(cpu[i].beam_y_pxl))));
+        CHECK(gpu[i].score == Catch::Approx(cpu[i].score).epsilon(1e-5));
+    }
+}
+
+// Largest difference of two scored surfaces. Entries that are -infinity in both (a centre the gates
+// refuse) are equal; one refused on one side only is counted as a gate mismatch.
+//
+// `pair_count` and `floor` exclude the centres sitting on the pair-count gate itself. That is not
+// special pleading, it is what the score is: at the gate a centre's mirror overlap is a quarter of
+// the largest, the masked Pearson there is a cancellation over the fewest pixels it is ever
+// computed over, and a 1e-7 difference in the convolutions lands at 1e-4 in r - measured, the worst
+// difference between the two paths on this image is at pair fraction 0.250021. Those centres are
+// discarded by both paths anyway; what has to agree is the surface the shortlist searches.
+struct SurfaceDifference {
+    double worst = 0.0;
+    size_t gate_mismatches = 0;
+};
+
+SurfaceDifference Compare(const std::vector<float> &got, const std::vector<float> &ref,
+                          const std::vector<float> *pair_count = nullptr, float floor = 0.0f) {
+    SurfaceDifference out;
+    for (size_t i = 0; i < ref.size(); i++) {
+        if (pair_count && (*pair_count)[i] < floor)
+            continue;
+        const bool a = std::isfinite(got[i]), b = std::isfinite(ref[i]);
+        if (a != b)
+            out.gate_mismatches++;
+        else if (a)
+            out.worst = std::max(out.worst, std::abs(static_cast<double>(got[i]) - ref[i]));
+    }
+    return out;
+}
+
+// The same for a convolution surface, which is not a correlation coefficient: it spans orders of
+// magnitude and its small entries are differences of large ones, so the difference is scaled by the
+// largest term of the reference rather than taken elementwise.
+double ScaledDifference(const std::vector<float> &got, const std::vector<float> &ref) {
+    double scale = 0.0, worst = 0.0;
+    for (float v : ref)
+        scale = std::max(scale, std::abs(static_cast<double>(v)));
+    for (size_t i = 0; i < ref.size(); i++)
+        worst = std::max(worst, std::abs(static_cast<double>(got[i]) - ref[i]));
+    return scale > 0.0 ? worst / scale : worst;
+}
+
+} // namespace
+
+// The GPU engine exists to make the capture affordable, not to answer differently. It no longer
+// shares the masked Pearson and the greedy search with the CPU path - both run on the device, where
+// the surfaces already are - so the two paths are compared at every level they still have in
+// common, not only at the answer:
+//
+//   1. the four convolutions, which both engines produce (`PointSurfaces`);
+//   2. the scored surface, the device kernel against `BeamCenterPointScore`, which is the reference
+//      the CPU path runs - `PointScoreSurface` exists for this and for nothing else;
+//   3. the shortlist, the device search against `BeamCenterShortlist2D` on the same surface;
+//   4. the whole score, shortlist positions and margins alike.
+//
+// What this can no longer do is what the first version of it did: prove that a difference could
+// only have come from the transform. A difference in (2) or (3) is now a difference between two
+// implementations of the same formula, which is why (2) and (3) are compared elementwise and
+// exactly rather than through their effect on the answer.
+TEST_CASE("BeamCenterFFTGPU_MatchesTheCPUEngine", "[BeamCenter][BeamCenterFFTGPU]") {
+    if (get_gpu_count() == 0) {
+        WARN("No CUDA GPU present. Skipping BeamCenterFFTGPU_MatchesTheCPUEngine");
+        return;
+    }
+
+    const int64_t w = 1100, h = 900;
+    const float cx = 397.25f, cy = 511.5f;
+    const auto mean = SynthesiseBackground(w, h, cx, cy);
+
+    BeamCenterFFTCPU cpu_engine;
+    BeamCenterFFTGPU gpu_engine;
+    const BeamCenterFFTSettings settings;
+
+    // The score works on the prepared image, which is internal; the engines below are fed the
+    // projection through the same entry point, so all four comparisons see the same preparation.
+    const auto cpu = BeamCenterFFTScore(w, h, mean, settings, cpu_engine);
+    const auto gpu = BeamCenterFFTScore(w, h, mean, settings, gpu_engine);
+
+    SECTION("the four convolutions") {
+        // Fed the raw projection rather than the prepared image: what matters here is that two
+        // transforms of the same arrays agree, not what the arrays are.
+        std::vector<float> a(mean), m(mean.size(), 1.0f);
+        for (size_t i = 0; i < a.size(); i++)
+            if (!std::isfinite(a[i])) {
+                a[i] = 0.0f;
+                m[i] = 0.0f;
+            }
+        const auto c = cpu_engine.PointSurfaces(a, m, h, w);
+        const auto g = gpu_engine.PointSurfaces(a, m, h, w);
+        CHECK(ScaledDifference(g.C, c.C) < 1e-6);
+        CHECK(ScaledDifference(g.S, c.S) < 1e-6);
+        CHECK(ScaledDifference(g.Q, c.Q) < 1e-6);
+        CHECK(ScaledDifference(g.D, c.D) < 1e-6);
+
+        // And the two combinations of them, through the one reference implementation: with the same
+        // four surfaces in, the formula is the formula.
+        const double variance = 1.0;   // only scales the no-evidence floor
+        const auto rc = BeamCenterPointScore(c, settings.min_pair_fraction, variance);
+        const auto rg = BeamCenterPointScore(g, settings.min_pair_fraction, variance);
+        float d_max = 0.0f;
+        for (float v : c.D)
+            d_max = std::max(d_max, v);
+        // Where the shortlist looks. Everywhere else the comparison measures the conditioning of
+        // the formula rather than either implementation of it: r is a ratio of two cancellations,
+        // and on a weak centre - a small mirror overlap, a denominator near nothing - the
+        // transform's 1e-6 lands at 1e-4 in r whichever path computed it (measured: 1.5e-4 at worst
+        // over the gated surface, 2.2e-4 if the centres sitting exactly on the pair-count gate are
+        // included). None of that reaches a peak, which is the only part of the surface anything
+        // reads.
+        float r_max = -std::numeric_limits<float>::infinity();
+        for (float v : rc)
+            if (std::isfinite(v))
+                r_max = std::max(r_max, v);
+        double peak_worst = 0.0;
+        for (size_t i = 0; i < rc.size(); i++)
+            if (std::isfinite(rc[i]) && rc[i] > 0.5f * r_max && std::isfinite(rg[i]))
+                peak_worst = std::max(peak_worst,
+                                      std::abs(static_cast<double>(rg[i]) - rc[i]));
+        CHECK(peak_worst < 1e-5);
+        // And the gate agrees: over four million centres, the two paths disagree about whether a
+        // centre is scored at all only for a handful sitting exactly on the threshold.
+        const auto diff = Compare(rg, rc, &c.D, 0.26f * d_max);
+        CHECK(diff.gate_mismatches == 0);
+        CHECK(Compare(rg, rc).gate_mismatches < 10);
+
+        // The device kernel against that reference, on the device's own surfaces - so this measures
+        // the combination and not the transform.
+        const auto device_score = gpu_engine.PointScoreSurface(a, m, h, w,
+                                                               settings.min_pair_fraction, variance);
+        const auto kernel = Compare(device_score, rg);
+        CHECK(kernel.gate_mismatches == 0);
+        CHECK(kernel.worst < 1e-6);   // the same formula on the same numbers, so this is exact-ish
+
+        // The device search against the host reference, on one surface. The device path is
+        // deterministic, so `PointShortlist` sees exactly the surface `PointScoreSurface` returned
+        // and this comparison is exact.
+        std::vector<float> surface = device_score;
+        const auto host_peaks = BeamCenterShortlist2D(surface, 2 * h, 2 * w,
+                                                      settings.nms_radius_pxl,
+                                                      settings.candidates_point);
+        BeamCenterFFTSettings scored_settings = settings;
+        const auto device_peaks = gpu_engine.PointShortlist(a, m, h, w, scored_settings, variance);
+        REQUIRE(device_peaks.size() == host_peaks.size());
+        for (size_t i = 0; i < host_peaks.size(); i++) {
+            INFO("peak " << i);
+            CHECK(device_peaks[i].beam_x_pxl == host_peaks[i].beam_x_pxl);
+            CHECK(device_peaks[i].beam_y_pxl == host_peaks[i].beam_y_pxl);
+            CHECK(device_peaks[i].score == host_peaks[i].score);
+        }
+    }
+
+    SECTION("the shortlists and the margins") {
+        REQUIRE(!cpu.point.empty());
+        CompareShortlist(gpu.point, cpu.point, "point surface");
+        CompareShortlist(gpu.line_x, cpu.line_x, "x line mirror");
+        CompareShortlist(gpu.line_y, cpu.line_y, "y line mirror");
+
+        // The margin is the surface's self-diagnostic, and it is a difference of two scores that sit
+        // within a fraction of a percent of each other - the quantity most exposed to a change of
+        // transform.
+        CHECK(gpu.margin_point == Catch::Approx(cpu.margin_point).margin(1e-5));
+        CHECK(gpu.margin_line_x == Catch::Approx(cpu.margin_line_x).margin(1e-5));
+        CHECK(gpu.margin_line_y == Catch::Approx(cpu.margin_line_y).margin(1e-5));
+    }
+}
+
+// The same identity test the CPU engine carries, on the device: an exactly centrosymmetric image
+// scores exactly 1 at its centre and the capture lands on that grid point. It is the cheapest
+// check there is for an indexing or sign error that only the device path has.
+TEST_CASE("BeamCenterFFTGPU_RecoversAnExactlySymmetricCentre", "[BeamCenter][BeamCenterFFTGPU]") {
+    if (get_gpu_count() == 0) {
+        WARN("No CUDA GPU present. Skipping BeamCenterFFTGPU_RecoversAnExactlySymmetricCentre");
+        return;
+    }
+
+    // Keyed on the canonical member of the +- pair, so the image is exactly its own mirror about
+    // (cx, cy) - the same construction the CPU identity test uses.
+    const int64_t w = 220, h = 180;
+    const float cx = 83.5f, cy = 61.5f;
+    std::vector<float> mean(static_cast<size_t>(w * h));
+    for (int64_t y = 0; y < h; y++)
+        for (int64_t x = 0; x < w; x++) {
+            int64_t dx = std::lround(2.0f * (static_cast<float>(x) - cx));
+            int64_t dy = std::lround(2.0f * (static_cast<float>(y) - cy));
+            if (dy < 0 || (dy == 0 && dx < 0)) {
+                dx = -dx;
+                dy = -dy;
+            }
+            uint64_t k = static_cast<uint64_t>(dx) * 0x9e3779b97f4a7c15ULL
+                         + static_cast<uint64_t>(dy) * 0xc2b2ae3d27d4eb4fULL;
+            k ^= k >> 31;
+            k *= 0xbf58476d1ce4e5b9ULL;
+            k ^= k >> 29;
+            mean[static_cast<size_t>(y * w + x)] = 100.0f + static_cast<float>(k % 4096u) * 0.25f;
+        }
+
+    BeamCenterFFTGPU engine;
+    const auto r = BeamCenterFFTScore(w, h, mean, BeamCenterFFTSettings{}, engine);
+    REQUIRE(!r.point.empty());
+    CHECK(r.point[0].beam_x_pxl == cx);
+    CHECK(r.point[0].beam_y_pxl == cy);
+    CHECK(r.point[0].score == Catch::Approx(1.0f).margin(1e-4));
+}
+
+// The card is shared, so the engine has to be able to say that an image will not fit before it
+// starts allocating - that is what sends the capture to the CPU instead of taking the run down.
+TEST_CASE("BeamCenterFFTGPU_SizesItsOwnFootprint", "[BeamCenter][BeamCenterFFTGPU]") {
+    if (get_gpu_count() == 0) {
+        WARN("No CUDA GPU present. Skipping BeamCenterFFTGPU_SizesItsOwnFootprint");
+        return;
+    }
+
+    // A 16 Mpixel detector is the largest this runs on, and it has to be a bounded cost.
+    CHECK(BeamCenterFFTGPU::DeviceMemoryNeeded(4148, 4362) < (3ull << 30));
+    // Bigger images need more.
+    CHECK(BeamCenterFFTGPU::DeviceMemoryNeeded(4148, 4362)
+          > BeamCenterFFTGPU::DeviceMemoryNeeded(1030, 1064));
+    // Nothing on this card can hold a hundred-gigapixel image.
+    CHECK(!BeamCenterFFTGPU::FitsInDeviceMemory(300000, 300000));
+}
+
+#endif
diff --git a/tests/BeamCenterFFTTest.cpp b/tests/BeamCenterFFTTest.cpp
new file mode 100644
index 000000000..7d9cc3b50
--- /dev/null
+++ b/tests/BeamCenterFFTTest.cpp
@@ -0,0 +1,316 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include <catch2/catch_all.hpp>
+
+#include <algorithm>
+#include <cmath>
+#include <cstdint>
+#include <cstdlib>
+#include <limits>
+#include <random>
+
+#include "../image_analysis/geom_refinement/BeamCenterFFT.h"
+#include "../image_analysis/geom_refinement/BeamCenterFFTCPU.h"
+#include "../image_analysis/geom_refinement/BeamCenterFFTEngine.h"
+
+namespace {
+
+// An isotropic scattered background about (cx, cy): a decaying continuum with a solvent-ring bump,
+// the mean of ~60 frames' worth of counting noise on top, NAN outside the detector's usable area.
+// A horizontal dead stripe stands in for a module gap.
+std::vector<float> Synthesise(int64_t w, int64_t h, float cx, float cy, float shadow_sector) {
+    std::vector<float> mean(static_cast<size_t>(w * h), NAN);
+    std::mt19937 rng(20260912);
+    std::normal_distribution<float> gauss(0.0f, 1.0f);
+    for (int64_t y = 0; y < h; y++) {
+        if (y >= 300 && y < 320)
+            continue;   // module gap
+        for (int64_t x = 0; x < w; x++) {
+            const float r = std::hypot(static_cast<float>(x) - cx, static_cast<float>(y) - cy);
+            const float t = (r - 260.0f) / 30.0f;
+            float value = 120.0f * std::exp(-r / 220.0f) + 45.0f * std::exp(-0.5f * t * t) + 5.0f;
+            const float phi = std::atan2(static_cast<float>(y) - cy, static_cast<float>(x) - cx);
+            if (phi > 0.0f && phi < 1.0f)
+                value *= shadow_sector;
+            mean[static_cast<size_t>(y * w + x)] = value + gauss(rng) * std::sqrt(value / 60.0f);
+        }
+    }
+    return mean;
+}
+
+} // namespace
+
+TEST_CASE("BeamCenterFFT_SyntheticBackground", "[BeamCenter]") {
+    // The centre is nowhere near the image middle - the score must not care.
+    const int64_t w = 900, h = 700;
+    const float cx = 297.25f, cy = 411.5f;
+
+    SECTION("clean isotropic background") {
+        const auto mean = Synthesise(w, h, cx, cy, 1.0f);
+        const auto r = BeamCenterFFTScore(w, h, mean);
+
+        REQUIRE(!r.point.empty());
+        REQUIRE(!r.line_x.empty());
+        REQUIRE(!r.line_y.empty());
+        // Whole-detector capture: the strongest point-symmetry centre is the true one.
+        CHECK(std::hypot(r.point[0].beam_x_pxl - cx, r.point[0].beam_y_pxl - cy) < 2.0f);
+        CHECK(std::abs(r.line_x[0].beam_x_pxl - cx) < 2.0f);
+        CHECK(std::abs(r.line_y[0].beam_y_pxl - cy) < 2.0f);
+        // A clean unimodal surface separates its argmax from the runner-up by a wide margin.
+        CHECK(r.margin_point > 0.05f);
+    }
+
+    SECTION("a shadowed sextant keeps the true centre in the shortlist") {
+        const auto mean = Synthesise(w, h, cx, cy, 0.5f);
+        const auto r = BeamCenterFFTScore(w, h, mean);
+
+        REQUIRE(!r.point.empty());
+        float best = 1e9f;
+        for (const auto &c : r.point)
+            best = std::min(best, std::hypot(c.beam_x_pxl - cx, c.beam_y_pxl - cy));
+        // The argmax is pulled by the asymmetry (measured ~9 px here - the same shadow bias the
+        // background estimator carries); the shortlist must still hold the answer within the
+        // 12 px a re-indexing verifier accepts.
+        CHECK(best < 12.0f);
+    }
+}
+
+namespace {
+
+// A value keyed on the distance from (cx, cy) in each coordinate, so the image is EXACTLY its own
+// mirror about that centre under point inversion AND under either line mirror - the three symmetries
+// the three surfaces measure. The preparation the score applies - clipping, median subtraction,
+// clamping, the mean shift - is pointwise and monotone, so it preserves all of them, and the masked
+// Pearson at the true centre is then exactly 1. Every other centre must score below it, because the
+// score is a correlation coefficient and cannot exceed 1.
+float SymmetricValue(int64_t x, int64_t y, float cx, float cy) {
+    const int64_t dx = std::llabs(std::lround(2.0f * (static_cast<float>(x) - cx)));
+    const int64_t dy = std::llabs(std::lround(2.0f * (static_cast<float>(y) - cy)));
+    uint64_t k = static_cast<uint64_t>(dx) * 0x9e3779b97f4a7c15ULL
+                 + static_cast<uint64_t>(dy) * 0xc2b2ae3d27d4eb4fULL;
+    k ^= k >> 31;
+    k *= 0xbf58476d1ce4e5b9ULL;
+    k ^= k >> 29;
+    return 100.0f + static_cast<float>(k % 4096u) * 0.25f;
+}
+
+// The symmetric pattern in a rectangle at (x0, y0), NAN everywhere else, so the same pattern can be
+// placed anywhere on the detector. The true centre is (x0 + cx, y0 + cy).
+std::vector<float> SymmetricPatch(int64_t w, int64_t h, int64_t x0, int64_t y0, int64_t rw,
+                                  int64_t rh, float cx, float cy) {
+    std::vector<float> mean(static_cast<size_t>(w * h), NAN);
+    for (int64_t y = 0; y < rh; y++)
+        for (int64_t x = 0; x < rw; x++)
+            mean[static_cast<size_t>((y0 + y) * w + x0 + x)] = SymmetricValue(x, y, cx, cy);
+    return mean;
+}
+
+// The four convolutions straight from their definitions, for an image small enough to afford it:
+// C(t) = sum_x a(x) a(t - x), S = a (*) m, Q = a^2 (*) m, D = m (*) m.
+BeamCenterConvSurfaces2D BruteForcePoint(const std::vector<float> &a, const std::vector<float> &m,
+                                         int64_t h, int64_t w) {
+    BeamCenterConvSurfaces2D out;
+    const size_t n = static_cast<size_t>(4 * h * w);
+    out.C.assign(n, 0.0f);
+    out.S.assign(n, 0.0f);
+    out.Q.assign(n, 0.0f);
+    out.D.assign(n, 0.0f);
+    for (int64_t ty = 0; ty < 2 * h; ty++)
+        for (int64_t tx = 0; tx < 2 * w; tx++) {
+            double c = 0, s = 0, q = 0, d = 0;
+            for (int64_t y = std::max<int64_t>(0, ty - h + 1); y <= std::min(h - 1, ty); y++)
+                for (int64_t x = std::max<int64_t>(0, tx - w + 1); x <= std::min(w - 1, tx); x++) {
+                    const size_t i = static_cast<size_t>(y * w + x);
+                    const size_t j = static_cast<size_t>((ty - y) * w + tx - x);
+                    c += static_cast<double>(a[i]) * a[j];
+                    s += static_cast<double>(a[i]) * m[j];
+                    q += static_cast<double>(a[i]) * a[i] * m[j];
+                    d += static_cast<double>(m[i]) * m[j];
+                }
+            const size_t t = static_cast<size_t>(ty * 2 * w + tx);
+            out.C[t] = static_cast<float>(c);
+            out.S[t] = static_cast<float>(s);
+            out.Q[t] = static_cast<float>(q);
+            out.D[t] = static_cast<float>(d);
+        }
+    return out;
+}
+
+// The same for the 1D mirror of the row coordinate: each column autoconvolved, summed over columns.
+BeamCenterConvSurfaces1D BruteForceLine(const std::vector<float> &a, const std::vector<float> &m,
+                                        int64_t h, int64_t w) {
+    BeamCenterConvSurfaces1D out;
+    out.C.assign(static_cast<size_t>(2 * h), 0.0);
+    out.S.assign(static_cast<size_t>(2 * h), 0.0);
+    out.Q.assign(static_cast<size_t>(2 * h), 0.0);
+    out.D.assign(static_cast<size_t>(2 * h), 0.0);
+    for (int64_t t = 0; t < 2 * h; t++)
+        for (int64_t x = 0; x < w; x++)
+            for (int64_t y = std::max<int64_t>(0, t - h + 1); y <= std::min(h - 1, t); y++) {
+                const size_t i = static_cast<size_t>(y * w + x);
+                const size_t j = static_cast<size_t>((t - y) * w + x);
+                out.C[static_cast<size_t>(t)] += static_cast<double>(a[i]) * a[j];
+                out.S[static_cast<size_t>(t)] += static_cast<double>(a[i]) * m[j];
+                out.Q[static_cast<size_t>(t)] += static_cast<double>(a[i]) * a[i] * m[j];
+                out.D[static_cast<size_t>(t)] += static_cast<double>(m[i]) * m[j];
+            }
+    return out;
+}
+
+// Largest relative difference of two surfaces, scaled by the largest term of the reference - a
+// convolution surface spans orders of magnitude and its small entries are differences of large
+// ones, so an elementwise relative test measures roundoff and nothing else.
+template <class T> double MaxScaledDifference(const std::vector<T> &got, const std::vector<T> &ref) {
+    double scale = 0.0, worst = 0.0;
+    for (T v : ref)
+        scale = std::max(scale, std::abs(static_cast<double>(v)));
+    for (size_t i = 0; i < ref.size(); i++)
+        worst = std::max(worst, std::abs(static_cast<double>(got[i]) - static_cast<double>(ref[i])));
+    return scale > 0.0 ? worst / scale : worst;
+}
+
+} // namespace
+
+// The identity the whole component rests on: the centrosymmetry score about c is the
+// autoconvolution at 2c, so one transform set scores every centre. On an exactly centrosymmetric
+// image the score at the true centre is exactly 1 and nowhere else can reach it - at integer and
+// at half-pixel centres alike, because the surface is sampled on the half-pixel grid.
+TEST_CASE("BeamCenterFFT_RecoversAnExactlySymmetricCentre", "[BeamCenter]") {
+    const int64_t w = 220, h = 180;
+
+    const float cx = GENERATE(83.0f, 83.5f);
+    const float cy = GENERATE(61.0f, 61.5f);
+
+    const auto mean = SymmetricPatch(w, h, 0, 0, w, h, cx, cy);
+    const auto r = BeamCenterFFTScore(w, h, mean);
+
+    REQUIRE(!r.point.empty());
+    CHECK(r.point[0].beam_x_pxl == cx);
+    CHECK(r.point[0].beam_y_pxl == cy);
+    CHECK(r.point[0].score == Catch::Approx(1.0f).margin(1e-4));
+    // The two line mirrors see the same symmetry one coordinate at a time.
+    REQUIRE(!r.line_x.empty());
+    REQUIRE(!r.line_y.empty());
+    CHECK(r.line_x[0].beam_x_pxl == cx);
+    CHECK(r.line_y[0].beam_y_pxl == cy);
+}
+
+// Move the image and the answer moves with it, exactly. The score is a convolution, so this is a
+// property and not a tolerance: an off-by-one in the padding, the crop or the t = 2c indexing shows
+// up here as a fixed offset, which is the class of error a synthetic image at one position cannot
+// see.
+TEST_CASE("BeamCenterFFT_IsShiftEquivariant", "[BeamCenter]") {
+    const int64_t w = 260, h = 200;
+    const int64_t rw = 150, rh = 120;
+    const float cx = 71.5f, cy = 55.0f;
+
+    const auto at_origin = BeamCenterFFTScore(w, h, SymmetricPatch(w, h, 0, 0, rw, rh, cx, cy));
+    REQUIRE(!at_origin.point.empty());
+
+    const int64_t tx = 37, ty = 43;
+    const auto shifted = BeamCenterFFTScore(w, h, SymmetricPatch(w, h, tx, ty, rw, rh, cx, cy));
+    REQUIRE(!shifted.point.empty());
+
+    CHECK(shifted.point[0].beam_x_pxl == at_origin.point[0].beam_x_pxl + static_cast<float>(tx));
+    CHECK(shifted.point[0].beam_y_pxl == at_origin.point[0].beam_y_pxl + static_cast<float>(ty));
+    CHECK(shifted.line_x[0].beam_x_pxl == at_origin.line_x[0].beam_x_pxl + static_cast<float>(tx));
+    CHECK(shifted.line_y[0].beam_y_pxl == at_origin.line_y[0].beam_y_pxl + static_cast<float>(ty));
+}
+
+// The four convolutions the score is built from, against their definitions. The masked Pearson is a
+// cancellation of large near-equal terms and the shortlist margins ride on differences of ~0.3 %,
+// so what matters is not that the transform is approximately right but by how much it is wrong.
+TEST_CASE("BeamCenterFFT_ConvolutionsAgreeWithBruteForce", "[BeamCenter]") {
+    const int64_t w = 23, h = 17;
+    std::vector<float> a(static_cast<size_t>(w * h)), m(static_cast<size_t>(w * h));
+    std::mt19937 rng(20260913);
+    std::uniform_real_distribution<float> uniform(-1.0f, 1.0f);
+    for (size_t i = 0; i < a.size(); i++) {
+        // A quarter of the pixels masked, in a pattern with no symmetry of its own.
+        m[i] = (i * 7919u) % 4u == 0u ? 0.0f : 1.0f;
+        a[i] = m[i] * (30.0f + 10.0f * uniform(rng));
+    }
+
+    BeamCenterFFTCPU engine;
+    const auto got = engine.PointSurfaces(a, m, h, w);
+    const auto ref = BruteForcePoint(a, m, h, w);
+    CHECK(MaxScaledDifference(got.C, ref.C) < 1e-6);
+    CHECK(MaxScaledDifference(got.S, ref.S) < 1e-6);
+    CHECK(MaxScaledDifference(got.Q, ref.Q) < 1e-6);
+    CHECK(MaxScaledDifference(got.D, ref.D) < 1e-6);
+
+    // And the score built from them, through the reference implementation both engines are held
+    // to - compared where the shortlist looks. r is a ratio of two cancellations, so on a weak
+    // centre the transform's 1e-6 lands at 1e-4 in r; at a peak it does not, and a peak is the only
+    // part of the surface anything reads. The margin here is what a float32 transform costs against
+    // an exact double reference on an image this small, where an overlap is a few hundred pixels.
+    const auto score = BeamCenterPointScore(got, 0.25f, 1.0);
+    const auto score_ref = BeamCenterPointScore(ref, 0.25f, 1.0);
+    float r_max = -std::numeric_limits<float>::infinity();
+    for (float v : score_ref)
+        if (std::isfinite(v))
+            r_max = std::max(r_max, v);
+    for (size_t i = 0; i < score.size(); i++) {
+        if (!std::isfinite(score_ref[i]) || score_ref[i] <= 0.5f * r_max)
+            continue;
+        INFO("surface element " << i);
+        REQUIRE(std::isfinite(score[i]));
+        REQUIRE(score[i] == Catch::Approx(score_ref[i]).margin(5e-5));
+    }
+
+    const auto got_line = engine.LineSurfaces(a, m, h, w, BeamCenterMirror::Rows);
+    const auto ref_line = BruteForceLine(a, m, h, w);
+    CHECK(MaxScaledDifference(got_line.C, ref_line.C) < 1e-6);
+    CHECK(MaxScaledDifference(got_line.S, ref_line.S) < 1e-6);
+    CHECK(MaxScaledDifference(got_line.Q, ref_line.Q) < 1e-6);
+    CHECK(MaxScaledDifference(got_line.D, ref_line.D) < 1e-6);
+}
+
+// A mirror overlap with no variance in it - a region the preparation has flattened to a constant -
+// makes the score 0/0, and in floating point that mints an r of several hundred out of pure
+// roundoff. The score is a correlation coefficient: no candidate may ever come back above 1.
+TEST_CASE("BeamCenterFFT_ANoVarianceOverlapScoresNothing", "[BeamCenter]") {
+    const int64_t w = 400, h = 320;
+    const int64_t pw = 240, ph = 200;
+    const float cx = 0.5f * static_cast<float>(pw - 1), cy = 0.5f * static_cast<float>(ph - 1);
+
+    // A flat detector-wide background - which the preparation clamps to a constant - with the
+    // textured, exactly symmetric patch filling one corner of it. Every centre whose overlap lies
+    // inside the flat part carries no evidence at all.
+    std::vector<float> mean(static_cast<size_t>(w * h), 100.0f);
+    for (int64_t y = 0; y < ph; y++)
+        for (int64_t x = 0; x < pw; x++)
+            mean[static_cast<size_t>(y * w + x)] = SymmetricValue(x, y, cx, cy);
+
+    const auto r = BeamCenterFFTScore(w, h, mean);
+    REQUIRE(!r.point.empty());
+    for (const auto &c : r.point)
+        CHECK(c.score <= 1.0f + 1e-3f);
+    CHECK(r.point[0].beam_x_pxl == cx);
+    CHECK(r.point[0].beam_y_pxl == cy);
+}
+
+// The transform length. A smooth length is what makes the whole-detector transform affordable: the
+// naive next power of two for a 16 Mpixel detector costs 3x the time and, on cuFFT, 2.5 GB of plan
+// memory against a few hundred MB.
+TEST_CASE("BeamCenterFFT_PadsToASmoothLength", "[BeamCenter]") {
+    CHECK(BeamCenterFFTPadSize(1) == 1);
+    CHECK(BeamCenterFFTPadSize(1024) == 1024);
+    CHECK(BeamCenterFFTPadSize(1025) == 1029);   // 3 * 7^3
+    CHECK(BeamCenterFFTPadSize(2027) == 2048);
+    CHECK(BeamCenterFFTPadSize(4931) == 5000);   // 2^3 * 5^4
+
+    for (int64_t n = 2000; n < 20000; n += 7) {
+        const int64_t pad = BeamCenterFFTPadSize(n);
+        REQUIRE(pad >= n);
+        int64_t v = pad;
+        for (int p : {2, 3, 5, 7})
+            while (v % p == 0)
+                v /= p;
+        REQUIRE(v == 1);
+        // And it is always close: the padding never costs a whole extra octave the way a
+        // power-of-two length can.
+        REQUIRE(pad < n + n / 20);
+    }
+}
diff --git a/tests/BeamCenterFromBackgroundTest.cpp b/tests/BeamCenterFromBackgroundTest.cpp
index 55129a853..73a547e92 100644
--- a/tests/BeamCenterFromBackgroundTest.cpp
+++ b/tests/BeamCenterFromBackgroundTest.cpp
@@ -4,7 +4,9 @@
 #include <catch2/catch_all.hpp>
 
 #include <cmath>
+#include <cstdint>
 #include <random>
+#include <vector>
 
 #include "../image_analysis/geom_refinement/BeamCenterFromBackground.h"
 #include "../common/DetectorSetup.h"
@@ -182,3 +184,126 @@ TEST_CASE("BeamCenterFromBackground_DoesNotDependOnTheThreadCount", "[BeamCenter
     CHECK(one->beam_y_pxl == many->beam_y_pxl);
     CHECK(one->sigma_pxl == many->sigma_pxl);
 }
+
+// FindBeamCenter is the walk with an FFT capture in front of it: the capture chooses the basin and
+// the walk finishes inside it and reports what it knows the answer to. The tests below are about
+// the composition - that the walk really is seeded where the capture landed, that a decline falls
+// back the way it is documented to, and that the beam stop is taken out of the image the capture
+// scores.
+
+namespace {
+
+// A projection that is NAN everywhere except one exactly centrosymmetric patch. The capture has an
+// unambiguous answer on it (a correlation coefficient cannot exceed 1, and the patch reaches 1 at
+// its own centre) while the ring fit has nothing at all: no ring of the 12-2.2 A band is covered
+// by a patch that small, from any start.
+std::vector<float> SymmetricPatchOnly(const DiffractionExperiment &experiment, float cx, float cy,
+                                      int half_size) {
+    const auto W = static_cast<int>(experiment.GetXPixelsNumConv());
+    const auto H = static_cast<int>(experiment.GetYPixelsNumConv());
+    std::vector<float> mean(static_cast<size_t>(W) * H, NAN);
+    for (int y = static_cast<int>(cy) - half_size; y <= static_cast<int>(cy) + half_size; y++)
+        for (int x = static_cast<int>(cx) - half_size; x <= static_cast<int>(cx) + half_size; x++) {
+            // Keyed on the canonical member of the +- pair about (cx, cy), so the patch is exactly
+            // its own mirror there.
+            int64_t dx = std::lround(2.0f * (static_cast<float>(x) - cx));
+            int64_t dy = std::lround(2.0f * (static_cast<float>(y) - cy));
+            if (dy < 0 || (dy == 0 && dx < 0)) {
+                dx = -dx;
+                dy = -dy;
+            }
+            uint64_t k = static_cast<uint64_t>(dx) * 0x9e3779b97f4a7c15ULL
+                         + static_cast<uint64_t>(dy) * 0xc2b2ae3d27d4eb4fULL;
+            k ^= k >> 31;
+            k *= 0xbf58476d1ce4e5b9ULL;
+            k ^= k >> 29;
+            mean[static_cast<size_t>(y) * W + x] = 100.0f + static_cast<float>(k % 4096u) * 0.25f;
+        }
+    return mean;
+}
+
+}   // namespace
+
+// The case the composition exists for. With the centre in the file destroyed - the value a
+// beamline writes when it has nothing to write - the walk has no ring of the fitted band covered
+// from where it starts, so it declines and says nothing at all. The capture does not care how
+// wrong the file is: it scores every centre on the detector in one transform set, and the walk
+// then finishes from there with a real fit sigma, low enough that a caller would commit it.
+TEST_CASE("FindBeamCenter_AnswersWhereTheWalkDeclines", "[BeamCenter]") {
+    DiffractionExperiment x = TestExperiment();
+    PixelMask pixel_mask(x);
+
+    const DiffractionGeometry geom_true = x.GetDiffractionGeometry();
+    const auto projection = SynthesiseProjection(x, pixel_mask, geom_true, 60.0f, 1.0f);
+    x.BeamX_pxl(0.0f).BeamY_pxl(0.0f);   // the destroyed header
+
+    CHECK(!FindBeamCenterFromBackground(x, pixel_mask, projection).has_value());
+
+    const auto composed = FindBeamCenter(x, pixel_mask, projection);
+    REQUIRE(composed.has_value());
+    CHECK(composed->beam_x_pxl == Catch::Approx(geom_true.GetBeamX_pxl()).margin(1.0));
+    CHECK(composed->beam_y_pxl == Catch::Approx(geom_true.GetBeamY_pxl()).margin(1.0));
+    CHECK(composed->sigma_pxl < 1.0f);
+}
+
+// The end of the fallback chain. Where the walk has nothing to fit from either start - neither from
+// the capture nor from the centre in the file - the capture stands alone, and it is disclosed as a
+// capture: BEAM_CENTER_CAPTURE_SIGMA_PXL sits above every ceiling a caller commits geometry on, so
+// the answer reaches the consumers that only need a hypothesis to test and is refused by the two
+// that would change the geometry with it.
+TEST_CASE("FindBeamCenter_FallsBackToTheCaptureAlone", "[BeamCenter]") {
+    DiffractionExperiment x = TestExperiment();
+    PixelMask pixel_mask(x);
+
+    const float cx = 700.5f, cy = 640.0f;
+    const auto projection = SymmetricPatchOnly(x, cx, cy, 90);
+
+    CHECK(!FindBeamCenterFromBackground(x, pixel_mask, projection).has_value());
+
+    const auto composed = FindBeamCenter(x, pixel_mask, projection);
+    REQUIRE(composed.has_value());
+    CHECK(composed->beam_x_pxl == cx);
+    CHECK(composed->beam_y_pxl == cy);
+    CHECK(composed->sigma_pxl == BEAM_CENTER_CAPTURE_SIGMA_PXL);
+}
+
+// The beam stop is blanked out of the image the capture scores. A large one-sided opaque region is
+// centrosymmetric about ITS own centre, and where it is big enough that preference beats the
+// background's - measured on a real umbra over 9.6 % of the detector, the capture landed 48 px out
+// and masking it put it back to 1.1 px. The mask that reaches the capture already has the stop in
+// it, so this costs nothing but has to keep working.
+TEST_CASE("FindBeamCenter_BlanksTheBeamStopOutOfTheCapture", "[BeamCenter]") {
+    DiffractionExperiment x = TestExperiment();
+    PixelMask pixel_mask(x);
+
+    const DiffractionGeometry geom_true = x.GetDiffractionGeometry();
+    auto projection = SynthesiseProjection(x, pixel_mask, geom_true, 60.0f, 1.0f);
+
+    // An umbra on one side of the beam: opaque, so the pixels under it carry no background.
+    const auto W = static_cast<int>(x.GetXPixelsNumConv());
+    const auto H = static_cast<int>(x.GetYPixelsNumConv());
+    const float sx = geom_true.GetBeamX_pxl() + 330.0f, sy = geom_true.GetBeamY_pxl() + 70.0f;
+    std::vector<uint32_t> stop(static_cast<size_t>(W) * H, 0);
+    for (int y = 0; y < H; y++)
+        for (int x_pxl = 0; x_pxl < W; x_pxl++)
+            if (std::hypot(x_pxl - sx, y - sy) < 300.0f) {
+                stop[static_cast<size_t>(y) * W + x_pxl] = 1;
+                projection[static_cast<size_t>(y) * W + x_pxl] = 0.0f;
+            }
+
+    const auto unmasked = BeamCenterFFTScore(W, H, projection);
+    REQUIRE(!unmasked.point.empty());
+
+    pixel_mask.LoadBeamStopMask(x, stop);
+    BeamCenterFFTResult capture;
+    const auto composed = FindBeamCenter(x, pixel_mask, projection, 0, &capture);
+    REQUIRE(composed.has_value());
+    REQUIRE(!capture.point.empty());
+
+    const float masked_error = std::hypot(capture.point[0].beam_x_pxl - geom_true.GetBeamX_pxl(),
+                                          capture.point[0].beam_y_pxl - geom_true.GetBeamY_pxl());
+    const float unmasked_error = std::hypot(unmasked.point[0].beam_x_pxl - geom_true.GetBeamX_pxl(),
+                                            unmasked.point[0].beam_y_pxl - geom_true.GetBeamY_pxl());
+    CHECK(masked_error < 12.0f);
+    CHECK(masked_error <= unmasked_error);
+}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cf3140099..6d748a52b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -108,6 +108,8 @@ ADD_EXECUTABLE(jfjoch_test
         MultiLatticeSearchTest.cpp
         LatticeReductionTest.cpp
         BeamCenterFromBackgroundTest.cpp
+        BeamCenterFFTTest.cpp
+        BeamCenterFFTGPUTest.cpp
         BeamCenterFromSpotsTest.cpp
 )
 
diff --git a/tests/JFJochStateMachineTest.cpp b/tests/JFJochStateMachineTest.cpp
index 3b140ceec..8e94f966e 100644
--- a/tests/JFJochStateMachineTest.cpp
+++ b/tests/JFJochStateMachineTest.cpp
@@ -551,3 +551,58 @@ TEST_CASE("JFJochStateMachine_PreflightRefusesBeforeStarting") {
                         Catch::Matchers::ContainsSubstring("preflight_refused_2468"));
     REQUIRE_FALSE(pusher.start_called);
 }
+
+namespace {
+    class NullPusher : public ImagePusher {
+    public:
+        void StartDataCollection(StartMessage &) override {}
+        bool EndDataCollection(const EndMessage &) override { return true; }
+        bool SendImage(const uint8_t *, size_t, int64_t) override { return true; }
+        bool SendCalibration(const CompressedImage &) override { return true; }
+        std::string PrintSetup() const override { return "NullPusher"; }
+        ImagePusherType GetType() const override { return ImagePusherType::Test; }
+    };
+}
+
+// Cancelling the dark-mask collection - the window between the receiver being started and Stop()
+// returning, which is where a calibration spends its time - must abandon the sequence. The mask
+// analysis always hands back a full-size array, every pixel that saw no frame reading as good, so
+// the size check the sequence relies on accepts a mask measured on nothing; and the dark mask is a
+// single step, so no later cancel_sequence check catches it. The calibration used to end Idle with
+// "Calibration sequence done" on a mask it never measured.
+TEST_CASE("JFJochStateMachine_DarkMaskCancelIsNotASuccess") {
+    Logger logger("JFJochStateMachine_DarkMaskCancelIsNotASuccess");
+
+    DarkMaskSettings mask_settings;
+    mask_settings.NumberOfFrames(100).MaxCounts(1).MaxFramesWithCounts(5);
+
+    // Nothing listens on the stream address, so no start message ever arrives and the collection
+    // stays in the window under test until it is cancelled.
+    DiffractionExperiment experiment(DetDECTRIS(1024, 1024, "Test", "127.0.0.1"));
+    experiment.ImportDarkMaskSettings(mask_settings);
+
+    AcquisitionDeviceGroup aq_devices;
+    NullPusher pusher;
+    JFJochReceiverService receiver_service(aq_devices, logger, pusher);
+
+    JFJochServices services(logger);
+    services.Receiver(&receiver_service);
+
+    JFJochStateMachine state_machine(experiment, services, logger);
+    state_machine.AddDetectorSetup(DetDECTRIS(1024, 1024, "Test", "127.0.0.1"));
+    state_machine.DebugOnly_SetState(JFJochState::Idle);
+
+    REQUIRE_NOTHROW(state_machine.Pedestal());
+
+    for (int i = 0; i < 400 && state_machine.GetStatus().state != JFJochState::Calibration; i++)
+        std::this_thread::sleep_for(25ms);
+    REQUIRE(state_machine.GetStatus().state == JFJochState::Calibration);
+
+    state_machine.Cancel();
+
+    REQUIRE_NOTHROW(state_machine.WaitTillMeasurementDone(std::chrono::seconds(30)));
+    auto status = state_machine.GetStatus();
+    REQUIRE(status.state != JFJochState::Idle);
+    REQUIRE(status.message_severity == BrokerStatus::MessageSeverity::Error);
+    REQUIRE_THAT(status.message.value_or(""), Catch::Matchers::ContainsSubstring("cancelled"));
+}
diff --git a/tests/LatticeSearchTest.cpp b/tests/LatticeSearchTest.cpp
index bd2fcecfc..56d9094e2 100644
--- a/tests/LatticeSearchTest.cpp
+++ b/tests/LatticeSearchTest.cpp
@@ -596,3 +596,46 @@ TEST_CASE("CrystalLattice::ToPrimitive gives an R-centred lattice its rhombohedr
     CHECK(back.c == Catch::Approx(c).epsilon(1e-4));
     CHECK(back.gamma == Catch::Approx(120.0).epsilon(1e-4));
 }
+
+// SymmetrizeMetric is what a run falls back on when it has adopted a group on a cell no fit under
+// that group produced. It has to do two things: leave the group's metric exactly satisfied, and move
+// the cell as little as that requires - which means the orientation it arrives in is kept.
+TEST_CASE("SymmetrizeMetric puts a cell onto the metric its group fixes") {
+    const auto &c2 = *gemmi::find_spacegroup_by_name("C 1 2 1");
+
+    // A C-centred monoclinic setting whose alpha is 1.5 deg off, as a freely refined metric promoted
+    // after integration arrives: the group cannot describe it.
+    const CrystalLattice off(160.0, 140.0, 90.0, 88.5, 119.9, 90.1);
+    const auto fixed = SymmetrizeMetric(off, c2).GetUnitCell();
+    CHECK(fixed.alpha == Catch::Approx(90.0).margin(1e-3));
+    CHECK(fixed.gamma == Catch::Approx(90.0).margin(1e-3));
+    // The free angle and the lengths stay where they were, to well inside the move it had to make.
+    CHECK(fixed.beta == Catch::Approx(119.9).margin(0.2));
+    CHECK(fixed.a == Catch::Approx(160.0).epsilon(2e-3));
+    CHECK(fixed.b == Catch::Approx(140.0).epsilon(2e-3));
+    CHECK(fixed.c == Catch::Approx(90.0).epsilon(2e-3));
+
+    // A cell the group already describes is not moved at all, whatever orientation it is in.
+    const CrystalLattice ok(80.0, 50.0, 60.0, 90.0, 105.0, 90.0);
+    const auto same = SymmetrizeMetric(ok, c2).GetUnitCell();
+    check_uc(same, 80.0, 50.0, 60.0, 90.0, 105.0, 90.0, 1e-3, 1e-3);
+
+    // ...including one that is not axis-aligned: the answer is a property of the lattice, not of the
+    // frame it is written in, and the orientation it came in is the orientation it goes out in.
+    const RotMatrix rot(0.7, Coord(1.0f, 2.0f, 3.0f).Normalize());
+    const CrystalLattice turned = off.Multiply(rot);
+    // A LEFT-handed basis keeps its hand and its angles: the three-Coord constructor would flip an
+    // axis and hand back the supplement of beta, which is a different cell from the one the
+    // reflections are indexed on - and a metric projection may not change the cell that much.
+    const CrystalLattice flipped = off.Multiply(gemmi::Mat33(-1, 0, 0, 0, 1, 0, 0, 0, 1));
+    REQUIRE(flipped.CalcVolume() < 0);
+    const auto left = SymmetrizeMetric(flipped, c2);
+    CHECK(left.CalcVolume() < 0);
+    CHECK(left.GetUnitCell().beta == Catch::Approx(flipped.GetUnitCell().beta).margin(1e-3));
+    CHECK(left.GetUnitCell().alpha == Catch::Approx(90.0).margin(1e-3));
+
+    const auto turned_fixed = SymmetrizeMetric(turned, c2);
+    check_uc(turned_fixed.GetUnitCell(), fixed.a, fixed.b, fixed.c, 90.0, fixed.beta, 90.0, 1e-3, 1e-3);
+    CHECK(turned_fixed.Vec0() * turned.Vec0()
+          == Catch::Approx(turned_fixed.Vec0().Length() * turned.Vec0().Length()).epsilon(1e-4));
+}
diff --git a/tests/MergeScaleTest.cpp b/tests/MergeScaleTest.cpp
index e5b90857e..5ca2294cb 100644
--- a/tests/MergeScaleTest.cpp
+++ b/tests/MergeScaleTest.cpp
@@ -2,8 +2,11 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <catch2/catch_all.hpp>
+
+#include <random>
 #include "../image_analysis/scale_merge/HKLKey.h"
 #include "../image_analysis/scale_merge/Merge.h"
+#include "../image_analysis/scale_merge/ResolutionCutoff.h"
 #include "gemmi/reciproc.hpp"
 
 TEST_CASE("HKLKey_NoSG_noMergeFriedel") {
@@ -255,3 +258,59 @@ TEST_CASE("MergeStats_NoReferenceCellLeavesCompletenessUnmeasured") {
         CHECK(Completeness(stats.overall) == 0.0);
     }
 }
+
+// ---------------------------------------------------------------- the automatic resolution cutoff
+namespace {
+    // Half-set pairs spread uniformly in s = 1/d^2 over [s_from, s_to), either correlated with each
+    // other (signal) or drawn independently (noise, CC1/2 ~ 0), so a whole CC1/2 curve can be built
+    // band by band.
+    void AddBand(std::vector<MergedReflection> &v, std::mt19937 &rng,
+                 double s_from, double s_to, int n, bool correlated) {
+        std::normal_distribution<double> g(0.0, 1.0);
+        for (int j = 0; j < n; ++j) {
+            MergedReflection m;
+            m.d = static_cast<float>(1.0 / std::sqrt(s_from + (j + 0.5) * (s_to - s_from) / n));
+            const double a = g(rng), b = g(rng);
+            m.I_half[0] = static_cast<float>(a);
+            m.I_half[1] = static_cast<float>(correlated ? a : b);
+            v.push_back(m);
+        }
+    }
+}
+
+// A clean fall-off: CC1/2 crosses the target where the signal stops, and the cut is written one
+// shell past it.
+TEST_CASE("ResolutionCutoff_CleanFallOff") {
+    Logger logger("test");
+    std::mt19937 rng(12345);
+    std::vector<MergedReflection> merged;
+    AddBand(merged, rng, 0.01, 0.25, 480, true);    // signal to 1/sqrt(0.25) = 2.00 A
+    AddBand(merged, rng, 0.25, 0.51, 520, false);   // noise beyond it
+
+    const auto rc = ComputeCCHalfLogisticCutoff(merged, 0.30, logger);
+    REQUIRE(rc.d_fit);
+    CHECK(*rc.d_fit == Catch::Approx(2.0).margin(0.15));
+    REQUIRE(rc.d_cut);
+    CHECK(*rc.d_cut < *rc.d_fit);                   // the deliberate one-shell extension
+    CHECK(*rc.d_cut == Catch::Approx(1.92).margin(0.15));
+}
+
+// A fall-off region a logistic cannot follow: CC1/2 drops through the target and comes straight back
+// up. The fitted crossing is then an extrapolation far past the bins it was made over, and reading
+// the cut off it writes the data deep into the noise; the crossing the bins themselves show is where
+// the signal stopped, and that is what must be used.
+TEST_CASE("ResolutionCutoff_RaggedFallOffIsReadOffTheBins") {
+    Logger logger("test");
+    std::mt19937 rng(12345);
+    std::vector<MergedReflection> merged;
+    AddBand(merged, rng, 0.01, 0.13, 240, true);    // signal to 1/sqrt(0.13) = 2.77 A
+    AddBand(merged, rng, 0.13, 0.17, 80, false);    // a hole below the target
+    AddBand(merged, rng, 0.17, 0.25, 160, true);    // correlated again - not a fall-off
+    AddBand(merged, rng, 0.25, 0.51, 520, false);
+
+    const auto rc = ComputeCCHalfLogisticCutoff(merged, 0.30, logger);
+    REQUIRE(rc.d_fit);
+    CHECK(*rc.d_fit == Catch::Approx(2.77).margin(0.20));
+    REQUIRE(rc.d_cut);
+    CHECK(*rc.d_cut > 2.30);                        // coarser than the band that correlates again
+}
diff --git a/tests/ResultReportTest.cpp b/tests/ResultReportTest.cpp
index e93069571..9dcec514a 100644
--- a/tests/ResultReportTest.cpp
+++ b/tests/ResultReportTest.cpp
@@ -20,21 +20,36 @@ namespace {
                                                .reason = SweepQualityReason::CrystalOutOfBeam,
                                                .severity = 0.83f, .rotation_deg = 5.0f,
                                                .mean_relative_scale = 0.12f, .mean_relative_cc = 0.30f,
-                                               .indexed_fraction = 0.015f});
+                                               .indexed_fraction = 0.015f,
+                                               .disposition = FrameDisposition::Rejected,
+                                               .delta_cc_half = -0.0312f, .delta_cc_half_se = 0.0060f});
         out.ranges.push_back(SweepQualityRange{.first_image = 400, .last_image = 499,
                                                .reason = SweepQualityReason::RadiationDamage,
                                                .severity = 0.41f, .rotation_deg = 10.0f,
                                                .mean_relative_scale = 0.55f, .mean_relative_cc = 0.80f,
-                                               .indexed_fraction = 0.62f});
+                                               .indexed_fraction = 0.62f,
+                                               .disposition = FrameDisposition::Downgraded,
+                                               .delta_cc_half = 0.0011f, .delta_cc_half_se = 0.0042f});
+        out.frames_merged = 450;
+        out.frames_downgraded = 100;
+        out.frames_rejected = 50;
+        out.rejected_deg = 5.0f;
         return out;
     }
 
     std::vector<std::string> ReasonVocabulary() {
         std::vector<std::string> out;
-        for (int r = 0; r <= static_cast<int>(SweepQualityReason::RadiationDamage); ++r)
+        for (int r = 0; r <= static_cast<int>(SweepQualityReason::InconsistentWithMerge); ++r)
             out.emplace_back(SweepQualityReasonCode(static_cast<SweepQualityReason>(r)));
         return out;
     }
+
+    std::vector<std::string> DispositionVocabulary() {
+        std::vector<std::string> out;
+        for (int d = 0; d <= static_cast<int>(FrameDisposition::Rejected); ++d)
+            out.emplace_back(FrameDispositionCode(static_cast<FrameDisposition>(d)));
+        return out;
+    }
 }
 
 TEST_CASE("SweepQuality_ReasonVocabulary", "[Diagnostics]") {
@@ -42,12 +57,19 @@ TEST_CASE("SweepQuality_ReasonVocabulary", "[Diagnostics]") {
     // where the per-image codes index this list from 1. A rename or a reorder silently breaks every
     // consumer, so pin both the spelling and the order here.
     const auto codes = ReasonVocabulary();
-    REQUIRE(codes.size() == 5);
+    REQUIRE(codes.size() == 6);
     CHECK(codes[0] == "no_diffraction");
     CHECK(codes[1] == "crystal_out_of_beam");
     CHECK(codes[2] == "weak_diffraction");
     CHECK(codes[3] == "loss_of_centring");
     CHECK(codes[4] == "radiation_damage");
+    CHECK(codes[5] == "inconsistent_with_merge");
+
+    // The disposition vocabulary is an interface for the same reasons, and the per-image HDF5 array
+    // indexes it from 0.
+    CHECK(std::string(FrameDispositionCode(FrameDisposition::Merged)) == "merged");
+    CHECK(std::string(FrameDispositionCode(FrameDisposition::Downgraded)) == "downgraded");
+    CHECK(std::string(FrameDispositionCode(FrameDisposition::Rejected)) == "rejected");
 }
 
 TEST_CASE("ResultReport_Render", "[Diagnostics]") {
@@ -70,7 +92,7 @@ TEST_CASE("ResultReport_Render", "[Diagnostics]") {
 
     // The stable keys a consumer greps for. The version is pinned on purpose: a key added to the
     // report is a contract change, and this line is where it has to be acknowledged.
-    CHECK(text.find("\nREPORT_VERSION= 7\n") != std::string::npos);
+    CHECK(text.find("\nREPORT_VERSION= 8\n") != std::string::npos);
     // SOHNCKE_SPACE_GROUP names the best group a chiral crystal could have, and it comes from the
     // space-group SEARCH. This fixture is given its group rather than searching for one, so there is
     // no Sohncke candidate to name and the key is absent - which is the honest behaviour and the
@@ -99,13 +121,27 @@ TEST_CASE("ResultReport_Render", "[Diagnostics]") {
     const auto dev_text = RenderResultReport("prefix", "in.h5", x, result, dev);
     CHECK(dev_text.find("\nSWEEP_QUALITY_STATUS= COMPUTED\n") != std::string::npos);
     CHECK(dev_text.find("\nSWEEP_QUALITY_REASONS= no_diffraction crystal_out_of_beam weak_diffraction "
-                        "loss_of_centring radiation_damage\n") != std::string::npos);
+                        "loss_of_centring radiation_damage inconsistent_with_merge\n") != std::string::npos);
+    CHECK(dev_text.find("\nSWEEP_DISPOSITIONS= merged downgraded rejected\n") != std::string::npos);
+
+    // The disposition headline: frames AND degrees, so that re-slicing cannot move the percentage
+    // without the degrees moving with it.
+    CHECK(text.find("\nFRAMES_MERGED= 450\n") != std::string::npos);
+    CHECK(text.find("\nFRAMES_DOWNGRADED= 100\n") != std::string::npos);
+    CHECK(text.find("\nFRAMES_REJECTED= 50\n") != std::string::npos);
+    CHECK(text.find("\nFRAMES_REJECTED_PCT= 8.33\n") != std::string::npos);
+    CHECK(text.find("\nROTATION_REJECTED_DEG= 5.0\n") != std::string::npos);
+    CHECK(text.find("600 frames / 60.0 deg; 450 merged (75.0%), 100 downgraded (16.7%)")
+          != std::string::npos);
 
     // One table row per range, with the reason code verbatim.
     CHECK(text.find("          100          149         50       5.0  crystal_out_of_beam ")
           != std::string::npos);
     CHECK(text.find("          400          499        100      10.0  radiation_damage    ")
           != std::string::npos);
+    // ... and its disposition beside what keeping it costs the merged intensities.
+    CHECK(text.find("rejected           -0.0312            0.0060") != std::string::npos);
+    CHECK(text.find("downgraded         +0.0011            0.0042") != std::string::npos);
 
     // ... and one plain-English WARNING line per range, greppable by the marker alone. They sit in
     // the SUMMARY at the top of the file now, which is what the verdict is composed from.
@@ -113,8 +149,12 @@ TEST_CASE("ResultReport_Render", "[Diagnostics]") {
     CHECK(text.find("\nVERDICT= WARNINGS\n") != std::string::npos);
     CHECK(text.find("\nPATHOLOGY_FLAGS= SWEEP_GAPS\n") != std::string::npos);
     CHECK(text.find("VERDICT=") < text.find("SWEEP_QUALITY_COUNT="));
-    CHECK(text.find("\nWARNING: Frames 100-149 out of beam (5.0 deg,") != std::string::npos);
-    CHECK(text.find("\nWARNING: Frames 400-499 radiation damage (10.0 deg,") != std::string::npos);
+    CHECK(text.find("\n# WARNING: Frames 100-149 out of beam (5.0 deg,") != std::string::npos);
+    CHECK(text.find("\n# WARNING: Frames 400-499 radiation damage (10.0 deg,") != std::string::npos);
+    CHECK(text.find("REJECTED: keeping them lowered CC1/2 by 0.0312 +/- 0.0060 over the "
+                    "reflections they touch") != std::string::npos);
+    CHECK(text.find("kept at their own reduced weight; removing them would change CC1/2 by -0.0011")
+          != std::string::npos);
 }
 
 TEST_CASE("ResultReport_RenderEmpty", "[Diagnostics]") {
@@ -184,6 +224,15 @@ TEST_CASE("SweepQuality_HDF5RoundTrip", "[HDF5][Full][Diagnostics]") {
                                         static_cast<uint8_t>(SweepQualityReason::CrystalOutOfBeam) + 1,
                                         0,
                                         static_cast<uint8_t>(SweepQualityReason::RadiationDamage) + 1};
+    // What was DONE about them: the out-of-beam pair is dropped, the damaged tail stays in at its own
+    // reduced weight, the rest merges. Indexed from 0, unlike the reason codes above.
+    const std::vector<uint8_t> expected_disposition{
+            static_cast<uint8_t>(FrameDisposition::Merged),
+            static_cast<uint8_t>(FrameDisposition::Merged),
+            static_cast<uint8_t>(FrameDisposition::Rejected),
+            static_cast<uint8_t>(FrameDisposition::Rejected),
+            static_cast<uint8_t>(FrameDisposition::Merged),
+            static_cast<uint8_t>(FrameDisposition::Downgraded)};
 
     {
         RegisterHDF5Filter();
@@ -194,6 +243,8 @@ TEST_CASE("SweepQuality_HDF5RoundTrip", "[HDF5][Full][Diagnostics]") {
         end_message.max_image_number = x.GetImageNum();
         end_message.sweep_quality = expected;
         end_message.sweep_quality_reasons = ReasonVocabulary();
+        end_message.frame_disposition = expected_disposition;
+        end_message.frame_disposition_codes = DispositionVocabulary();
 
         FileWriter writer(start_message);
         std::vector<int16_t> image(x.GetPixelsNum(), 42);
@@ -214,6 +265,8 @@ TEST_CASE("SweepQuality_HDF5RoundTrip", "[HDF5][Full][Diagnostics]") {
         CHECK(dataset->sweep_quality == expected);
         // The vocabulary travels with the codes, so a consumer can name them without this source.
         CHECK(dataset->sweep_quality_reasons == ReasonVocabulary());
+        CHECK(dataset->frame_disposition == expected_disposition);
+        CHECK(dataset->frame_disposition_codes == DispositionVocabulary());
     }
 
     REQUIRE(H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL) == 0);
@@ -363,7 +416,7 @@ TEST_CASE("ResultReport_ModelValidationSection", "[Diagnostics]") {
     CHECK(cc_text.find("\nCC_MODEL_CONFIRMED_TO_D_MIN= 2.10\n") != std::string::npos);
     CHECK(cc_text.find("D_MIN  CC_MODEL          N     SIGMA") != std::string::npos);
     CHECK(cc_text.find("      1.80    0.0412       2110      +1.9") != std::string::npos);
-    CHECK(cc_text.find("Read it in ONE direction only") != std::string::npos);
+    CHECK(cc_text.find("The table reads in ONE direction only") != std::string::npos);
 
     // Nothing significant anywhere: the key still has to be written, saying so.
     ModelValidationResult no_signal = with_cc;
@@ -519,6 +572,21 @@ TEST_CASE("ResultReport_FittedResolutionSuppressed", "[Diagnostics]") {
     result.resolution_fit_A = 0.95;
     CHECK(RenderResultReport("p", "in.h5", x, result).find("\nFITTED_RESOLUTION= 0.95\n")
           != std::string::npos);
+
+    // CC1/2 that drops through the target and climbs back above it is not a fall-off either, and the
+    // finest shell reaching the target is then noise correlating with noise - so a fit the test above
+    // accepts must still be suppressed, and the user told so in the default report.
+    ProcessResult climbs = result;
+    climbs.merge_statistics.shells.back().cc_half = 0.05;
+    MergeStatisticsShell noise = climbs.merge_statistics.shells.back();
+    noise.d_max = 0.80f;
+    noise.d_min = 0.70f;
+    noise.cc_half = 0.60;
+    climbs.merge_statistics.shells.push_back(noise);
+    const auto climbs_text = RenderResultReport("p", "in.h5", x, climbs);
+    CHECK(climbs_text.find("FITTED_RESOLUTION=") == std::string::npos);
+    CHECK(climbs_text.find("climbs back above it at 0.70 A") != std::string::npos);
+    CHECK(climbs_text.find("RESOLUTION_FIT") != std::string::npos);
 }
 
 // The completeness of the range where the signal is, beside the completeness of the range that was
@@ -590,7 +658,7 @@ TEST_CASE("ResultReport_TranslationalNCS", "[Diagnostics]") {
     {
         const auto text = RenderResultReport("prefix", "in.h5", x, result);
         CHECK(text.find("\nTNCS_DETECTED= NOT_MEASURED\n") != std::string::npos);
-        CHECK(text.find("not a\n statement that this crystal has none") != std::string::npos);
+        CHECK(text.find("not a\n# statement that this crystal has none") != std::string::npos);
     }
 
     result.tncs.measurable = true;
diff --git a/tests/RotationIndexerTest.cpp b/tests/RotationIndexerTest.cpp
index 8b7b1111f..7fdf2b2a5 100644
--- a/tests/RotationIndexerTest.cpp
+++ b/tests/RotationIndexerTest.cpp
@@ -98,3 +98,85 @@ TEST_CASE("RotationIndexer") {
     CHECK(ret->search_result.centering == 'P');
     CHECK(ret->search_result.system == gemmi::CrystalSystem::Orthorhombic);
 }
+
+// RefineConstrained is what a caller reaches for when it has ADOPTED a symmetry the indexing never
+// refined under - the intensities confirm a two-fold the spot positions never offered - and so holds
+// a cell whose metric is still the free fit's. Give it such a cell: the lattice this crystal indexes
+// on, sheared so that alpha is a degree off, which is what that situation looks like. The constraint
+// has to take it back to a cell the group can describe, and the spots have to be happier for it.
+TEST_CASE("RotationIndexer::RefineConstrained puts a free metric back on its class") {
+    DiffractionExperiment exp_i;
+    exp_i.IncidentEnergy_keV(WVL_1A_IN_KEV)
+         .BeamX_pxl(1000)
+         .BeamY_pxl(1000)
+         .DetectorDistance_mm(200)
+         .ImagesPerTrigger(50);
+
+    IndexingSettings settings;
+#ifdef JFJOCH_USE_CUDA
+    settings.Algorithm(IndexingAlgorithmEnum::FFT);
+#elif JFJOCH_USE_FFTW
+    settings.Algorithm(IndexingAlgorithmEnum::FFTW);
+#else
+    return;
+#endif
+    settings.RotationIndexing(true).RotationIndexingAngularStride_deg(1.0).RotationIndexingMinAngularRange_deg(30.0);
+    exp_i.ImportIndexingSettings(settings);
+
+    const CrystalLattice latt_base =
+        CrystalLattice(40, 50, 80, 90, 105, 90).Multiply(RotMatrix(2.0, Coord(sqrt(3)/3, sqrt(3)/3, sqrt(3)/3)));
+
+    GoniometerAxis axis("omega", 0.0f, 1.0f, Coord(1, 0, 0), std::nullopt);
+    exp_i.Goniometer(axis);
+
+    BraggPredictionSettings prediction_settings{ .high_res_A = 1.3, .ewald_dist_cutoff = 0.002 };
+    IndexerThreadPool indexer_thread_pool(exp_i.GetIndexingSettings());
+    RotationIndexer indexer(exp_i, indexer_thread_pool);
+    BraggPrediction prediction;
+
+    for (int img = 0; img < 50; ++img) {
+        std::vector<SpotToSave> spots;
+        const float angle_deg = axis.GetAngle_deg(img) + axis.GetWedge_deg() / 2.0f;
+        const CrystalLattice latt_img = latt_base.Multiply(axis.GetTransformationAngle(angle_deg).transpose());
+        const auto n = prediction.Calc(exp_i, latt_img, prediction_settings);
+        for (int i = 0; i < n; ++i) {
+            const auto &r = prediction.GetReflections().at(i);
+            SpotToSave s{};
+            s.x = r.predicted_x;
+            s.y = r.predicted_y;
+            s.image = img;
+            s.intensity = 1.0f;
+            s.phi = angle_deg;
+            s.ice_ring = false;
+            s.indexed = true;
+            spots.push_back(s);
+        }
+        indexer.ProcessImage(img, spots);
+        if (img == 30)
+            indexer.RunIndexing();
+    }
+
+    REQUIRE(indexer.GetLattice().has_value());
+
+    // Shear c along b: the orientation and two of the axes are untouched, and alpha - which the class
+    // fixes at 90 - moves by about a degree. A free refinement that has walked into a class leaves
+    // exactly this, a cell the group cannot describe standing in the group's own setting.
+    const CrystalLattice sheared(latt_base.Vec0(), latt_base.Vec1(),
+                                 latt_base.Vec2() + latt_base.Vec1() * 0.02f);
+    CHECK(std::fabs(sheared.GetUnitCell().alpha - 90.0) > 0.5);
+
+    const auto refit = indexer.RefineConstrained(sheared, gemmi::CrystalSystem::Monoclinic);
+    REQUIRE(refit.has_value());
+    const auto uc = refit->lattice.GetUnitCell();
+    CHECK(uc.alpha == Catch::Approx(90.0).margin(1e-3));
+    CHECK(uc.gamma == Catch::Approx(90.0).margin(1e-3));
+    // ...and it is the cell the crystal has, not merely a cell obeying the constraint.
+    CHECK(uc.a == Catch::Approx(40.0).margin(0.2));
+    CHECK(uc.b == Catch::Approx(50.0).margin(0.2));
+    CHECK(uc.c == Catch::Approx(80.0).margin(0.2));
+    CHECK(uc.beta == Catch::Approx(105.0).margin(0.2));
+    // The spots decide whether a caller keeps it, so the fractions have to be the real comparison:
+    // the sheared cell indexes worse than the one the constraint brings back.
+    CHECK(refit->indexed_fraction > refit->indexed_fraction_before);
+    CHECK(refit->indexed_fraction > 0.5f);
+}
diff --git a/tests/SearchSpaceGroupTest.cpp b/tests/SearchSpaceGroupTest.cpp
index c06b32acd..2e6361d8e 100644
--- a/tests/SearchSpaceGroupTest.cpp
+++ b/tests/SearchSpaceGroupTest.cpp
@@ -88,9 +88,9 @@ namespace {
                         .h = h,
                         .k = k,
                         .l = l,
-                        .I = absent ? 0.0 : SyntheticIntensityFromAsu(asu),
+                        .I = static_cast<float>(absent ? 0.0 : SyntheticIntensityFromAsu(asu)),
                         .sigma = 1.0,
-                        .d = CalcSyntheticD(h, k, l)
+                        .d = static_cast<float>(CalcSyntheticD(h, k, l))
                     });
                 }
             }
@@ -323,7 +323,8 @@ TEST_CASE("SearchSpaceGroup operator correlation reads symmetry, not the resolut
                     const double jitter = SyntheticIntensityFromAsu(gemmi::Op::Miller{{h, k, l}}) / 350.0;
                     const double I = 1.0e5 * falloff * jitter;
                     merged.push_back(MergedReflection{
-                        .h = h, .k = k, .l = l, .I = I, .sigma = I / 20.0, .d = d});
+                        .h = h, .k = k, .l = l, .I = static_cast<float>(I),
+                        .sigma = static_cast<float>(I / 20.0), .d = static_cast<float>(d)});
                 }
         return merged;
     };
diff --git a/tests/SearchSpaceGroupTwinTest.cpp b/tests/SearchSpaceGroupTwinTest.cpp
index 46bc8814e..acc533344 100644
--- a/tests/SearchSpaceGroupTwinTest.cpp
+++ b/tests/SearchSpaceGroupTwinTest.cpp
@@ -22,7 +22,7 @@
 // SearchSpaceGroupTest.cpp exercises Stage B (systematic absences) on noise-free, exactly-symmetric
 // intensities. The decision that actually goes wrong on real crystals is Stage A: whether the extra
 // operator of the metric holohedry is a real symmetry or a twin law. That decision runs through the
-// merge chi^2 gate, its systematic-b rescue and the systematic-b veto - none of which the noise-free
+// merge chi^2 gate, its systematic-b rescue and the operator gates - none of which the noise-free
 // set can reach, because it has no errors for a chi^2 to be reduced by.
 //
 // Three crystals are modelled per lattice, all with the SAME metric symmetry (a merohedral twin has
diff --git a/tests/ShadowFinderTest.cpp b/tests/ShadowFinderTest.cpp
index 92f36f74e..0efdb4c5f 100644
--- a/tests/ShadowFinderTest.cpp
+++ b/tests/ShadowFinderTest.cpp
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <cmath>
 #include <cstring>
+#include <optional>
 #include <vector>
 
 #include "../common/DetectorSetup.h"
@@ -103,7 +104,7 @@ TEST_CASE("ShadowFinder_FindsAnInjectedBeamStop", "[ShadowFinder]") {
     // Pinned from the serial implementation. A rewrite of the dilation, the hole fill or the ring
     // median that moves the mask by one pixel fails here, rather than in a merging statistic
     // several stages downstream.
-    CHECK(std::count(mask.begin(), mask.end(), 1u) == 2669);
+    CHECK(std::count(mask.begin(), mask.end(), 1u) == 2612);
 }
 
 // The per-pixel passes are split across threads, so where the split falls must not be visible in the
@@ -175,3 +176,202 @@ TEST_CASE("ShadowFinder_ASymmetricSceneGivesASymmetricMask", "[ShadowFinder]") {
         }
     }
 }
+
+// Hardware that shadows the detector need not touch the direct beam: a pin or a loop begins some way
+// out in radius, with lit detector between it and the stop. The scene here is that - a beam stop
+// with its arm, and a separate opaque patch far from both - and the patch has to come back as
+// shadow. Anchoring the search at the beam centre, as an earlier version did, returned the stop and
+// discarded the patch however deep it was.
+TEST_CASE("ShadowFinder_FindsAShadowThatDoesNotTouchTheBeam", "[ShadowFinder]") {
+    const DiffractionExperiment x = TestExperiment();
+    const PixelMask pixel_mask(x);
+    ShadowFinder finder(x, pixel_mask);
+
+    // Well clear of the stop, and wide enough that the ring it sits on still has lit pixels to be
+    // compared against - as a real pin shadow does, covering part of a ring and not all of it.
+    constexpr int PATCH_X0 = 175, PATCH_X1 = 245, PATCH_Y0 = 30, PATCH_Y1 = 90;
+
+    std::vector<std::vector<int32_t>> frames;
+    std::vector<uint8_t> buffer;
+    for (int f = 0; f < NFRAMES; f++) {
+        frames.push_back(Scene(/*cross=*/false, /*reflection=*/false));
+        for (int y = PATCH_Y0; y <= PATCH_Y1; y++)
+            for (int xi = PATCH_X0; xi <= PATCH_X1; xi++)
+                frames.back()[I(xi, y)] = 0;
+        DataMessage msg{};
+        msg.image = CompressedImage(frames.back(), W, H);
+        finder.AddImage(msg, buffer);
+    }
+
+    const auto mask = finder.GetMask();
+    CHECK(mask[I((PATCH_X0 + PATCH_X1) / 2, (PATCH_Y0 + PATCH_Y1) / 2)] == 1);
+    CHECK(mask[I(PATCH_X0 + 5, PATCH_Y0 + 5)] == 1);
+    CHECK(mask[I(C, C)] == 1);                  // the stop is still found
+    CHECK(mask[I(PATCH_X0 - 40, PATCH_Y0)] == 0);   // and the lit detector between them is kept
+    CHECK(mask[I(0, H - 1)] == 0);
+}
+
+// A flat, unobstructed scene has no shadow in it. The per-pixel test no longer has to reach the
+// beam centre, so what keeps it from calling a wandering background a shadow is size alone - and
+// that has to hold on a scene where nothing is blocked at all.
+TEST_CASE("ShadowFinder_FindsNothingOnAnUnobstructedScene", "[ShadowFinder]") {
+    const DiffractionExperiment x = TestExperiment();
+    const PixelMask pixel_mask(x);
+    ShadowFinder finder(x, pixel_mask);
+
+    std::vector<std::vector<int32_t>> frames;
+    std::vector<uint8_t> buffer;
+    for (int f = 0; f < NFRAMES; f++) {
+        frames.emplace_back(static_cast<size_t>(W) * H, BACKGROUND);
+        DataMessage msg{};
+        msg.image = CompressedImage(frames.back(), W, H);
+        finder.AddImage(msg, buffer);
+    }
+
+    const auto mask = finder.GetMask();
+    CHECK(std::count(mask.begin(), mask.end(), 1u) == 0);
+}
+
+// The rings are drawn about a beam centre, and a centre in a file can be a long way from the truth.
+// On a background that falls with radius, rings drawn about the wrong point cut across that
+// fall-off, and pixels that are simply further out than the ring's median read as shadow: a large
+// part of the detector comes back masked with nothing blocking it. The caller therefore names the
+// centre it has measured, and that is the one the comparison has to use.
+TEST_CASE("ShadowFinder_TheRingsFollowTheCentreTheCallerNames", "[ShadowFinder]") {
+    // Far enough out that the ring about the file's centre spans a wide range of true radii.
+    constexpr int OFFSET = 100;
+    // Opaque, well clear of the beam, and larger than the smallest region the test may return.
+    constexpr int PATCH_X0 = 175, PATCH_X1 = 245, PATCH_Y0 = 30, PATCH_Y1 = 90;
+    constexpr int PATCH_PX = (PATCH_X1 - PATCH_X0 + 1) * (PATCH_Y1 - PATCH_Y0 + 1);
+
+    DiffractionExperiment x = TestExperiment();
+    x.BeamX_pxl(static_cast<float>(C + OFFSET));   // what the file claims
+    const PixelMask pixel_mask(x);
+    ShadowFinder finder(x, pixel_mask);
+
+    // A background falling with the true radius, kept under MIN_REFLECTION so no pixel is exempt.
+    std::vector<std::vector<int32_t>> frames;
+    std::vector<uint8_t> buffer;
+    for (int f = 0; f < NFRAMES; f++) {
+        frames.emplace_back(static_cast<size_t>(W) * H, 0);
+        for (int y = 0; y < H; y++)
+            for (int xi = 0; xi < W; xi++) {
+                const float r = std::hypot(static_cast<float>(xi - C), static_cast<float>(y - C));
+                const bool blocked = xi >= PATCH_X0 && xi <= PATCH_X1 && y >= PATCH_Y0 && y <= PATCH_Y1;
+                frames.back()[I(xi, y)] = blocked ? 0 : std::lround(24.0f * std::exp(-r / 80.0f));
+            }
+        DataMessage msg{};
+        msg.image = CompressedImage(frames.back(), W, H);
+        finder.AddImage(msg, buffer);
+    }
+
+    const auto at_file = finder.GetMask();
+    finder.BeamCenter(static_cast<float>(C), static_cast<float>(C));
+    const auto at_measured = finder.GetMask();
+
+    // The patch is shadow either way - it is opaque, and no centre makes it look lit.
+    CHECK(at_file[I((PATCH_X0 + PATCH_X1) / 2, (PATCH_Y0 + PATCH_Y1) / 2)] == 1);
+    CHECK(at_measured[I((PATCH_X0 + PATCH_X1) / 2, (PATCH_Y0 + PATCH_Y1) / 2)] == 1);
+
+    // About the true centre the rings are flat and only the patch and its penumbra come back;
+    // about the file's they cut across the fall-off and a large part of the detector does.
+    const auto masked_at_file = std::count(at_file.begin(), at_file.end(), 1u);
+    const auto masked_at_measured = std::count(at_measured.begin(), at_measured.end(), 1u);
+    CHECK(masked_at_measured < 2 * PATCH_PX);
+    CHECK(masked_at_file > 3 * PATCH_PX);
+}
+
+// The background is not flat around a ring: a polarized source suppresses it in its own plane, by
+// a factor that reaches four at the 2 theta a short detector distance puts in a corner. That is
+// several times the dip this class looks for, so with the modulation left in, half of every outer
+// ring reads as shadow with nothing in the beam. The scene here is exactly that and nothing else -
+// a background carrying the Kahn factor of a horizontally polarized source, no hardware anywhere -
+// and it must come back empty when the experiment states its polarization, and does not when it
+// says nothing, which is what the correction is for.
+TEST_CASE("ShadowFinder_APolarizedBackgroundIsNotAShadow", "[ShadowFinder]") {
+    // Short enough that this small detector reaches 2 theta = 70 degrees in its corner, where
+    // the source suppresses its own plane to a fifth. A real geometry gets there with a short
+    // crystal-to-detector distance and a large detector.
+    constexpr float DISTANCE_MM = 5.0f;
+    constexpr float POLARIZATION = 0.99f;
+    // Counts per pixel per frame across the azimuth the source does not suppress. Below
+    // MIN_REFLECTION, so no pixel of this scene is exempt as a recorded reflection.
+    constexpr int LEVEL = 24;
+
+    DiffractionExperiment reference = TestExperiment();
+    const float pixel_mm = reference.GetPixelSize_mm();
+
+    std::vector<int32_t> frame(static_cast<size_t>(W) * H);
+    for (int y = 0; y < H; y++)
+        for (int x = 0; x < W; x++) {
+            const double dx = x - C, dy = y - C;
+            const double rho = std::hypot(dx, dy) * pixel_mm;
+            const double cos_2theta_sq = DISTANCE_MM * DISTANCE_MM
+                                         / (DISTANCE_MM * DISTANCE_MM + rho * rho);
+            const double rr = dx * dx + dy * dy;
+            const double cos_2phi = rr > 0.0 ? (dx * dx - dy * dy) / rr : 0.0;
+            const double factor = 0.5 * (1.0 + cos_2theta_sq
+                                         - POLARIZATION * cos_2phi * (1.0 - cos_2theta_sq));
+            // Normalised per ring by the azimuth the source does not suppress, so what is left
+            // varies around a ring and not with radius - the ring median absorbs the rest.
+            const double at_peak = 0.5 * (1.0 + cos_2theta_sq
+                                          + POLARIZATION * (1.0 - cos_2theta_sq));
+            frame[I(x, y)] = static_cast<int32_t>(std::lround(LEVEL * factor / at_peak));
+        }
+
+    auto mask_for = [&](const std::optional<float> &polarization) {
+        DiffractionExperiment x = TestExperiment();
+        x.DetectorDistance_mm(DISTANCE_MM).PolarizationFactor(polarization);
+        const PixelMask pixel_mask(x);
+        ShadowFinder finder(x, pixel_mask);
+        std::vector<uint8_t> buffer;
+        for (int f = 0; f < NFRAMES; f++) {
+            DataMessage msg{};
+            msg.image = CompressedImage(frame, W, H);
+            finder.AddImage(msg, buffer);
+        }
+        const auto mask = finder.GetMask();
+        return std::count(mask.begin(), mask.end(), 1u);
+    };
+
+    CHECK(mask_for(POLARIZATION) == 0);
+    CHECK(mask_for(std::nullopt) > static_cast<long>(W) * H / 20);
+}
+
+// Inside the stop a whole ring is blocked, so its own median is blocked too and the per-pixel
+// comparison has nothing to work with; the walk that finds those rings is what covers the disk.
+// It decides by comparing a ring against what this detector's background typically is - and NOT
+// against the brightest ring anywhere further out, which a sample whose background peaks well away
+// from the beam turns into a beam stop the size of that peak. The scene here is that: an ordinary
+// stop, and a strong ring at four times the background far outside it. What comes back has to be
+// the stop, not a disk reaching the ring.
+TEST_CASE("ShadowFinder_ABrightRingIsNotABeamStop", "[ShadowFinder]") {
+    constexpr int RING_R = 100, RING_HALF = 2, RING_LEVEL = 8 * BACKGROUND;
+
+    const DiffractionExperiment x = TestExperiment();
+    const PixelMask pixel_mask(x);
+    ShadowFinder finder(x, pixel_mask);
+
+    std::vector<std::vector<int32_t>> frames;
+    std::vector<uint8_t> buffer;
+    for (int f = 0; f < NFRAMES; f++) {
+        frames.push_back(Scene(/*cross=*/false, /*reflection=*/false));
+        for (int y = 0; y < H; y++)
+            for (int xi = 0; xi < W; xi++) {
+                const double r = std::hypot(xi - C, y - C);
+                if (std::abs(r - RING_R) <= RING_HALF)
+                    frames.back()[I(xi, y)] = RING_LEVEL;
+            }
+        DataMessage msg{};
+        msg.image = CompressedImage(frames.back(), W, H);
+        finder.AddImage(msg, buffer);
+    }
+
+    const auto mask = finder.GetMask();
+    CHECK(mask[I(C, C)] == 1);                   // the stop is still covered
+    CHECK(mask[I(C, C - STOP_R - 20)] == 0);     // lit detector between the stop and the ring
+    CHECK(mask[I(C, C - RING_R + 5)] == 0);
+    CHECK(mask[I(C, C - RING_R)] == 0);          // and the ring itself
+    // Anything much beyond the stop, its arm and their penumbra means the walk ran away.
+    CHECK(std::count(mask.begin(), mask.end(), 1u) < 6000);
+}
diff --git a/tests/ZMQImagePusherTest.cpp b/tests/ZMQImagePusherTest.cpp
index f1b025d5f..beaa18517 100644
--- a/tests/ZMQImagePusherTest.cpp
+++ b/tests/ZMQImagePusherTest.cpp
@@ -334,3 +334,89 @@ TEST_CASE("ZMQImageCommTest_NoWriter","[ZeroMQ]") {
     EndMessage end_message{};
     REQUIRE(!pusher.EndDataCollection(end_message));
 }
+
+// A puller whose queue nobody drains must still shut down. Before this was fixed, the CBOR thread
+// parked in PutBlocking on the full outside_fifo, the puller thread backed up behind it in
+// cbor_fifo, and Disconnect() hung for ever on the joins - which froze the whole broker, because
+// the receiver service destroys the previous run's puller from Start(), holding its state mutex,
+// which in a calibration sequence is itself held under the state machine's mutex.
+TEST_CASE("ZMQImagePuller_DisconnectWithFullQueue","[ZeroMQ]") {
+    Logger logger(Catch::getResultCapture().getCurrentTestName());
+
+    ZMQSocket sender(ZMQSocketType::Push);
+    sender.SendWaterMark(4 * ImagePuller::DefaultQueueSize);
+    sender.Bind("ipc://*");
+
+    auto puller = std::make_unique<ZMQImagePuller>(sender.GetEndpointName());
+
+    std::vector<uint8_t> pixels(1024, 11);
+    DataMessage data_message{
+            .number = 1,
+            .image = CompressedImage(pixels, 32, 32)
+    };
+    std::vector<uint8_t> v(64 * 1024);
+    CBORStream2Serializer serializer(v.data(), v.size());
+    serializer.SerializeImage(data_message);
+
+    // Twice the queue size, so the CBOR thread is certainly blocked on a full queue by the end
+    for (int i = 0; i < 2 * ImagePuller::DefaultQueueSize; i++)
+        sender.Send(v.data(), serializer.GetBufferSize());
+
+    while (puller->GetCurrentFifoUtilization() < ImagePuller::DefaultQueueSize)
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+
+    auto shutdown = std::async(std::launch::async, [&] { puller.reset(); });
+    REQUIRE(shutdown.wait_for(std::chrono::seconds(30)) == std::future_status::ready);
+}
+
+// A run that ends while the detector is still streaming leaves outside_fifo full and the CBOR
+// thread blocked in PutBlocking on it. Suspend() cannot release it - the flag is only tested
+// before the put - so the next run's ResumeAndClear has to. Nothing else ever would: a Get on an
+// empty queue notifies no producer, so a queue emptied under a waiting producer leaves it asleep
+// for good, and every collection after that one silently receives nothing at all - no images and
+// no start message - while the puller looks perfectly healthy.
+TEST_CASE("ZMQImagePuller_RecoversFromFullQueue","[ZeroMQ]") {
+    Logger logger(Catch::getResultCapture().getCurrentTestName());
+
+    ZMQSocket sender(ZMQSocketType::Push);
+    sender.SendWaterMark(8 * ImagePuller::DefaultQueueSize);
+    sender.Bind("ipc://*");
+
+    ZMQImagePuller puller(sender.GetEndpointName());
+
+    std::vector<uint8_t> pixels(1024, 11);
+    auto send_image = [&](int64_t number) {
+        DataMessage data_message{
+                .number = number,
+                .image = CompressedImage(pixels, 32, 32)
+        };
+        std::vector<uint8_t> v(64 * 1024);
+        CBORStream2Serializer serializer(v.data(), v.size());
+        serializer.SerializeImage(data_message);
+        sender.Send(v.data(), serializer.GetBufferSize());
+    };
+
+    // Images still arriving after the last run stopped consuming them
+    for (int i = 0; i < 2 * ImagePuller::DefaultQueueSize; i++)
+        send_image(1);
+
+    while (puller.GetCurrentFifoUtilization() < ImagePuller::DefaultQueueSize)
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+
+    puller.Suspend();        // what JFJochServices::Stop does when the run ends
+    puller.ResumeAndClear(); // ... and what JFJochServices::Start does for the run after it
+
+    // The run after it must still be able to receive
+    send_image(4242);
+
+    bool received = false;
+    auto deadline = std::chrono::steady_clock::now() + std::chrono::seconds(30);
+    while (!received && (std::chrono::steady_clock::now() < deadline)) {
+        auto msg = puller.PollImage(std::chrono::milliseconds(10));
+        if (msg && msg->cbor && msg->cbor->data_message && (msg->cbor->data_message->number == 4242))
+            received = true;
+    }
+    REQUIRE(received);
+
+    puller.Disconnect();
+}
diff --git a/viewer/CMakeLists.txt b/viewer/CMakeLists.txt
index 482cb72c2..7431dd674 100644
--- a/viewer/CMakeLists.txt
+++ b/viewer/CMakeLists.txt
@@ -12,7 +12,7 @@ ELSE()
     OPTION(JFJOCH_VIEWER_DBUS "Build viewer with D-Bus support (Linux only)" OFF)
 ENDIF()
 
-SET(JFJOCH_VIEWER_QT_COMPONENTS Core Gui Widgets Charts Concurrent OpenGL OpenGLWidgets)
+SET(JFJOCH_VIEWER_QT_COMPONENTS Core Gui Widgets Charts Concurrent)
 IF(JFJOCH_VIEWER_DBUS)
     LIST(APPEND JFJOCH_VIEWER_QT_COMPONENTS DBus)
 ENDIF()
@@ -23,6 +23,8 @@ QT_ADD_RESOURCES(APP_RESOURCES resources/resources.qrc)
 ADD_EXECUTABLE(jfjoch_viewer jfjoch_viewer.cpp JFJochViewerWindow.cpp JFJochViewerWindow.h
         JFJochViewerMenu.cpp
         JFJochViewerMenu.h
+        RemoteDisplayMode.cpp
+        RemoteDisplayMode.h
         image_viewer/JFJochDiffractionImage.cpp
         image_viewer/JFJochDiffractionImage.h
         image_viewer/JFJochSimpleImage.cpp
@@ -70,8 +72,8 @@ ADD_EXECUTABLE(jfjoch_viewer jfjoch_viewer.cpp JFJochViewerWindow.cpp JFJochView
         widgets/CollapsibleSection.h
         widgets/ToolbarIcons.cpp
         widgets/ToolbarIcons.h
-        widgets/JFJochViewerImageStrip.cpp
-        widgets/JFJochViewerImageStrip.h
+        widgets/JFJochViewerFileBrowser.cpp
+        widgets/JFJochViewerFileBrowser.h
         windows/JFJochViewerSpotListWindow.cpp
         windows/JFJochViewerSpotListWindow.h
         image_viewer/JFJochAzIntImage.cpp
@@ -110,8 +112,6 @@ ADD_EXECUTABLE(jfjoch_viewer jfjoch_viewer.cpp JFJochViewerWindow.cpp JFJochView
         widgets/PowderCalibrationWidget.cpp
         widgets/PowderCalibrationWidget.h
         ${APP_RESOURCES}
-        windows/JFJochViewerReciprocalSpaceWindow.cpp
-        windows/JFJochViewerReciprocalSpaceWindow.h
         windows/JFJochMagnifierWindow.cpp
         windows/JFJochMagnifierWindow.h
         windows/JFJochProcessingJobsWindow.cpp
@@ -119,7 +119,6 @@ ADD_EXECUTABLE(jfjoch_viewer jfjoch_viewer.cpp JFJochViewerWindow.cpp JFJochView
 )
 
 TARGET_LINK_LIBRARIES(jfjoch_viewer Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Charts Qt6::Concurrent
-        Qt6::OpenGL Qt6::OpenGLWidgets
         JFJochReader JFJochLogger JFJochCommon JFJochWriter JFJochImageAnalysis Rugnux
         fftw3f libcurl_static)   # vendored static libcurl by concrete name, not the CURL::libcurl
                                  # alias, which a system libcurl can shadow (see top-level CMakeLists)
diff --git a/viewer/JFJochHttpReader.cpp b/viewer/JFJochHttpReader.cpp
index 31419cbf1..d072174b1 100644
--- a/viewer/JFJochHttpReader.cpp
+++ b/viewer/JFJochHttpReader.cpp
@@ -11,6 +11,7 @@
 #include "../broker/gen/model/Plots.h"
 #include "../broker/gen/model/Broker_status.h"
 #include "../broker/gen/model/Roi_definitions.h"
+#include "../common/InstrumentMetadata.h"
 #include "../common/JFJochMath.h"
 #include "../image_analysis/bragg_integration/CalcISigma.h"
 
@@ -259,9 +260,18 @@ std::shared_ptr<JFJochReaderDataset> JFJochHttpReader::UpdateDataset_i() {
 
         dataset->experiment.NumTriggers(1);
         dataset->experiment.ImagesPerTrigger(msg->start_message->number_of_images);
+
+        InstrumentMetadata instrument;
+        instrument.SourceName(msg->start_message->source_name);
+        instrument.SourceType(msg->start_message->source_type);
+        instrument.InstrumentName(msg->start_message->instrument_name);
+        dataset->experiment.ImportInstrumentMetadata(instrument);
+
         dataset->experiment.SampleName(msg->start_message->sample_name);
         dataset->experiment.SampleTemperature_K(msg->start_message->sample_temperature_K);
         dataset->experiment.RingCurrent_mA(msg->start_message->ring_current_mA);
+        dataset->experiment.TotalFlux(msg->start_message->total_flux);
+        dataset->experiment.AttenuatorTransmission(msg->start_message->attenuator_transmission);
         dataset->experiment.IncidentEnergy_keV(msg->start_message->incident_energy / 1000.0);
 
         dataset->experiment.FluorescenceSpectrum(msg->start_message->fluorescence_spectrum);
diff --git a/viewer/JFJochImageReadingWorker.cpp b/viewer/JFJochImageReadingWorker.cpp
index e1893f564..889098de6 100644
--- a/viewer/JFJochImageReadingWorker.cpp
+++ b/viewer/JFJochImageReadingWorker.cpp
@@ -21,8 +21,6 @@
 #include <QVector>
 #include <QMutexLocker>
 #include <QFileInfo>
-#include <QPainter>
-#include <QFontMetrics>
 #include <algorithm>
 
 #include "../preview/JFJochTIFF.h"
@@ -110,7 +108,6 @@ JFJochImageReadingWorker::JFJochImageReadingWorker(const SpotFindingSettings &se
     http_reader.Experiment(experiment);
     hdf5_reader.Experiment(experiment);
     cbf_reader.Experiment(experiment);
-    thumb_color_scale_.Select(ColorScaleEnum::Indigo);
 
     autoload_timer = new QTimer(this);
     autoload_timer->setInterval(autoload_interval);
@@ -205,6 +202,15 @@ void JFJochImageReadingWorker::FileOpenRetryTimerExpired() {
 
 void JFJochImageReadingWorker::LoadFile_i(const QString &filename, qint64 image_number, qint64 summation, bool retry) {
        try {
+        // The file (in file mode) is already open: nothing to (re)read, just move to the requested
+        // image. Without this, a caller that re-issues LoadFile per image instead of LoadImage (e.g.
+        // a D-Bus client stepping through a dataset) pays a full close+reopen+reparse of the HDF5
+        // dataset for every single image, instead of the cheap single-image read LoadImage does.
+        if (!http_mode && !filename.isEmpty() && filename == current_file) {
+            LoadImage_i(image_number, summation);
+            return;
+        }
+
         std::shared_ptr<const JFJochReaderDataset> dataset;
         auto start = std::chrono::high_resolution_clock::now();
 
@@ -1049,16 +1055,6 @@ void JFJochImageReadingWorker::setAutoLoadJump(int64_t val) {
         jump_value = val;
 }
 
-void JFJochImageReadingWorker::LoadSpots(int64_t start_image, int64_t end_image, int64_t stride) {
-    QMutexLocker ul(&m);
-    std::shared_ptr<JFJochReaderSpots> result;
-    if (http_mode)
-        result = http_reader.ReadAllSpots(start_image, end_image, stride);
-    else
-        result = file_reader->ReadAllSpots(start_image, end_image, stride);
-    emit spotsLoaded(result);
-}
-
 ReprocessingInputs JFJochImageReadingWorker::GetReprocessingInputs() const {
     QMutexLocker ul(&m);
     ReprocessingInputs in;
@@ -1162,128 +1158,3 @@ void JFJochImageReadingWorker::SetActiveSnapshot(QString name) {
     }
 }
 
-
-void JFJochImageReadingWorker::SetThumbnailColorMap(int color_map) {
-    QMutexLocker locker(&m);
-    thumb_color_scale_.Select(static_cast<ColorScaleEnum>(color_map));
-}
-
-void JFJochImageReadingWorker::SetThumbnailFeatureColor(QColor c) {
-    QMutexLocker locker(&m);
-    thumb_feature_color_ = c;
-}
-
-void JFJochImageReadingWorker::SetThumbnailSpotColor(QColor c) {
-    QMutexLocker locker(&m);
-    thumb_spot_color_ = c;
-}
-
-void JFJochImageReadingWorker::RenderThumbnails(QVector<qint64> image_numbers, bool show_spots) {
-    // File mode only; live HTTP cannot address arbitrary images cheaply.
-    if (http_mode)
-        return;
-    for (qint64 n : image_numbers) {
-        QImage thumb = RenderThumbnail_i(n, show_spots);
-        if (!thumb.isNull())
-            emit thumbnailReady(n, thumb);
-    }
-}
-
-QImage JFJochImageReadingWorker::RenderThumbnail_i(int64_t image_number, bool show_spots) {
-    // Everything runs inside one try: an uncaught exception here would be on the worker thread and
-    // would std::terminate the whole app. On any failure we just skip this thumbnail.
-    try {
-        std::shared_ptr<JFJochReaderImage> img;
-        {
-            QMutexLocker locker(&m);
-            if (http_mode || image_number < 0 || image_number >= total_images)
-                return {};
-            img = file_reader->LoadImage(image_number, 1);
-        }
-        if (!img)
-            return {};
-
-        const int W = static_cast<int>(img->Dataset().experiment.GetXPixelsNum());
-        const int H = static_cast<int>(img->Dataset().experiment.GetYPixelsNum());
-        const auto &px = img->Image();
-        if (W <= 0 || H <= 0 || static_cast<int64_t>(px.size()) < static_cast<int64_t>(W) * H)
-            return {};
-
-        const auto &lut = thumb_color_scale_.LUTData();
-        const int lutSize = static_cast<int>(lut.size());
-        if (lutSize <= 0)
-            return {};
-
-        // Downsample by block-maximum (keeps sharp Bragg spots), then map through the LUT.
-        constexpr int maxDim = 120;
-        const double s = static_cast<double>(maxDim) / std::max(W, H);
-        const int tw = std::max(1, static_cast<int>(W * s));
-        const int th = std::max(1, static_cast<int>(H * s));
-        const int bx = std::max(1, W / tw);
-        const int by = std::max(1, H / th);
-
-        const float fg = std::max(1.0f, static_cast<float>(img->GetAutoContrastValue()));
-        const float invRange = (lutSize - 1) / fg;
-        const rgb gap = thumb_color_scale_.Apply(ColorScaleSpecial::Gap);
-
-        QImage out(tw, th, QImage::Format_RGB32);
-        for (int ty = 0; ty < th; ++ty) {
-            QRgb *line = reinterpret_cast<QRgb *>(out.scanLine(ty));
-            const int y1 = std::min(H, ty * by + by);
-            for (int tx = 0; tx < tw; ++tx) {
-                const int x1 = std::min(W, tx * bx + bx);
-                int32_t best = 0;
-                bool any = false;
-                for (int yy = ty * by; yy < y1; ++yy)
-                    for (int xx = tx * bx; xx < x1; ++xx) {
-                        const int32_t v = px[yy * W + xx];
-                        if (v == GAP_PXL_VALUE || v == ERROR_PXL_VALUE || v == BEAM_STOP_PXL_VALUE) continue;
-                        if (v == SATURATED_PXL_VALUE) { best = static_cast<int32_t>(fg); any = true; continue; }
-                        if (!any || v > best) { best = v; any = true; }
-                    }
-                rgb c;
-                if (!any) {
-                    c = gap;
-                } else {
-                    int idx = static_cast<int>(std::max(0, best) * invRange + 0.5f);
-                    idx = std::clamp(idx, 0, lutSize - 1);
-                    c = lut[idx];
-                }
-                line[tx] = qRgb(c.r, c.g, c.b);
-            }
-        }
-
-        if (show_spots) {
-            QPainter p(&out);
-            p.setRenderHint(QPainter::Antialiasing);
-            for (const auto &sp : img->ImageData().spots) {
-                p.setPen(QPen(sp.indexed ? thumb_feature_color_ : thumb_spot_color_, 1.0));
-                p.drawEllipse(QPointF(sp.x * s, sp.y * s), 1.6, 1.6);
-            }
-        }
-
-        // Image-number badge in the top-left, so the strip needs no text label (and loses no height).
-        {
-            QPainter p(&out);
-            p.setRenderHint(QPainter::Antialiasing);
-            QFont f = p.font();
-            f.setBold(true);
-            f.setPixelSize(11);
-            p.setFont(f);
-            const QString label = QString::number(image_number + 1);
-            const QRect tb = QFontMetrics(f).boundingRect(label);
-            const QRect badge(2, 2, tb.width() + 8, tb.height() + 2);
-            p.setPen(Qt::NoPen);
-            p.setBrush(QColor(0xFA, 0x72, 0x68));        // coral
-            p.drawRoundedRect(badge, 3, 3);
-            p.setPen(Qt::white);
-            p.drawText(badge, Qt::AlignCenter, label);
-        }
-        return out;
-    } catch (const std::exception &e) {
-        logger.Debug("Thumbnail render failed for image {}: {}", image_number, e.what());
-        return {};
-    } catch (...) {
-        return {};
-    }
-}
diff --git a/viewer/JFJochImageReadingWorker.h b/viewer/JFJochImageReadingWorker.h
index 6bb2b7f4f..fa502d8d0 100644
--- a/viewer/JFJochImageReadingWorker.h
+++ b/viewer/JFJochImageReadingWorker.h
@@ -10,10 +10,6 @@
 #include <QMutex>
 #include <QTimer>
 #include <QElapsedTimer>
-#include <QImage>
-#include <QColor>
-
-#include "../common/ColorScale.h"
 
 #include "../reader/JFJochHDF5Reader.h"
 #include "../reader/JFJochCBFReader.h"
@@ -30,7 +26,6 @@
 
 Q_DECLARE_METATYPE(std::shared_ptr<const JFJochReaderDataset>)
 Q_DECLARE_METATYPE(std::shared_ptr<const JFJochReaderImage>)
-Q_DECLARE_METATYPE(std::shared_ptr<const JFJochReaderSpots>)
 
 Q_DECLARE_METATYPE(DiffractionExperiment)
 Q_DECLARE_METATYPE(SpotFindingSettings)
@@ -112,11 +107,6 @@ private:
 
     SpotFindingSettings spot_finding_settings;
 
-    ColorScale thumb_color_scale_;   // colour map used for the image-strip thumbnails
-    QColor thumb_feature_color_ = Qt::magenta;   // indexed-spot overlay (matches the main viewer)
-    QColor thumb_spot_color_ = Qt::green;        // non-indexed spot overlay
-    QImage RenderThumbnail_i(int64_t image_number, bool show_spots);
-
     std::optional<int64_t> current_image;
     int64_t current_summation = 1;
     int64_t total_images = 0;
@@ -192,7 +182,6 @@ private:
 signals:
     void datasetLoaded(std::shared_ptr<const JFJochReaderDataset>);
     void imageLoaded(std::shared_ptr<const JFJochReaderImage>);
-    void spotsLoaded(std::shared_ptr<const JFJochReaderSpots>);
     void imageStatsUpdated(std::shared_ptr<const JFJochReaderImage>);
     void imageNumberChanged(int64_t total_images, int64_t current_image);
     void setRings(const QVector<float> &v);
@@ -206,7 +195,6 @@ signals:
     void snapshotsChanged(QStringList names, QString active);
     void runsChanged(QVector<RunData> runs, QString active_id);
     void fileOpened();   // a new file/stream was loaded - listeners should reset per-file state
-    void thumbnailReady(qint64 image_number, QImage thumb);   // for the image-strip / hit feed
     void referenceMtzChanged(ReferenceMtzInfo info);   // a reference MTZ was (un)loaded - update the dock
 
 public:
@@ -226,7 +214,6 @@ public slots:
     void LoadFile(const QString &filename, qint64 image_number, qint64 summation, bool retry);
     void CloseFile();
     void LoadImage(int64_t image_number, int64_t summation);
-    void LoadSpots(int64_t start_image, int64_t end_image, int64_t stride);
 
     void UpdateDataset(const DiffractionExperiment& experiment);
 
@@ -274,11 +261,4 @@ public slots:
     void SetActiveSnapshot(QString name);
     void RenameRun(QString id, QString label);   // change a run's display label (legend)
     void RemoveRun(QString id);                  // drop a reprocessing snapshot (not "Original")
-
-    // Render downsampled thumbnails for the given images (file mode only), emitting thumbnailReady
-    // for each; non-disruptive (does not change the displayed image).
-    void RenderThumbnails(QVector<qint64> image_numbers, bool show_spots);
-    void SetThumbnailColorMap(int color_map);
-    void SetThumbnailFeatureColor(QColor c);
-    void SetThumbnailSpotColor(QColor c);
 };
diff --git a/viewer/JFJochProcessController.cpp b/viewer/JFJochProcessController.cpp
index 752ea0a4b..530f632f8 100644
--- a/viewer/JFJochProcessController.cpp
+++ b/viewer/JFJochProcessController.cpp
@@ -4,7 +4,9 @@
 #include "JFJochProcessController.h"
 #include "../reader/JFJochCBFReader.h"
 #include "../reader/JFJochHDF5Reader.h"
+#include "../rugnux/ResultReport.h"
 
+#include <QElapsedTimer>
 #include <QMetaType>
 
 #include <cmath>
@@ -67,6 +69,13 @@ void JFJochProcessController::run_(QString file_path, DiffractionExperiment expe
             last_live_emit_ = {};
         }
 
+        // The report is rendered from the run's own results after Run(); keep what it needs
+        // before Rugnux consumes the experiment and the config.
+        const DiffractionExperiment report_experiment = experiment;
+        const std::string output_prefix = config.output_prefix;
+        QElapsedTimer run_timer;
+        run_timer.start();
+
         Rugnux process(reader, std::move(experiment), std::move(pixel_mask), std::move(config));
         active_ = &process;
         if (cancel_pending_)
@@ -74,9 +83,23 @@ void JFJochProcessController::run_(QString file_path, DiffractionExperiment expe
 
         ProcessResult result = process.Run(this);
 
+        // The same text the CLI writes as <prefix>_report.txt, shown in the analysis window. As
+        // with WriteResultReport, a run that produced results must not be lost to a report
+        // failure, so a throw here leaves the report empty rather than failing the job.
+        QString report;
+        if (!result.cancelled) {
+            try {
+                RunProvenance provenance;
+                provenance.wall_time_s = run_timer.elapsed() / 1000.0;
+                report = QString::fromStdString(RenderResultReport(
+                    output_prefix, file_path.toStdString(), report_experiment, result, provenance));
+            } catch (...) {
+            }
+        }
+
         active_ = nullptr;
         running_ = false;
-        emit finished(result);
+        emit finished(result, report);
     } catch (const std::exception &e) {
         active_ = nullptr;
         running_ = false;
diff --git a/viewer/JFJochProcessController.h b/viewer/JFJochProcessController.h
index 5b11a67f6..8f16f4462 100644
--- a/viewer/JFJochProcessController.h
+++ b/viewer/JFJochProcessController.h
@@ -43,7 +43,9 @@ signals:
     void started();
     void phaseChanged(QString phase);
     void progress(quint64 done, quint64 total);
-    void finished(ProcessResult result);
+    // `report` is the rugnux result report (the <prefix>_report.txt text), rendered from the run's
+    // own results so the viewer can show it without a file; empty for a cancelled run.
+    void finished(ProcessResult result, QString report);
     void failed(QString error);
     // Per-image results accumulated so far, for live dataset-info plots while a job runs (throttled).
     void liveDataset(std::shared_ptr<const JFJochReaderDataset> dataset);
diff --git a/viewer/JFJochViewerDatasetInfo.cpp b/viewer/JFJochViewerDatasetInfo.cpp
index 237836734..20e547799 100644
--- a/viewer/JFJochViewerDatasetInfo.cpp
+++ b/viewer/JFJochViewerDatasetInfo.cpp
@@ -4,10 +4,20 @@
 #include <QGridLayout>
 #include <QPushButton>
 #include <QColor>
+#include <QSettings>
 
 #include "JFJochViewerDatasetInfo.h"
 
 namespace {
+    // Combo data value of the combined spots + background plot.
+    constexpr int SPOTS_PLUS_BACKGROUND = 16;
+
+    // Grid scans and standard scans keep separate saved favourites.
+    QString FavouriteGroup(bool grid_scan) {
+        return grid_scan ? QStringLiteral("datasetInfoPlot/gridScan")
+                         : QStringLiteral("datasetInfoPlot/standard");
+    }
+
     // Stable colour per run by its position in the run list (Original is index 0 -> blue), so a
     // run keeps its colour whether it is the active (primary) line or an overlay.
     QColor RunColor(int index) {
@@ -30,24 +40,19 @@ JFJochViewerDatasetInfo::JFJochViewerDatasetInfo(QWidget *parent) : QWidget(pare
     auto layout = new QGridLayout(this);
     combo_box = new QComboBox(this);
 
-    last_selection = 0;
-
     layout->addWidget(combo_box, 0, 0);
 
-    auto reset_button = new QPushButton("Reset zoom", this);
-    reset_button->setFixedWidth(100);
+    reset_button = new QPushButton("Reset zoom", this);
 
     grid_button = new QPushButton("Grid", this);
-    grid_button->setFixedWidth(100);
     grid_button->setCheckable(true);
     grid_button->setEnabled(false);
 
     image_button = new QPushButton("Per-image", this);
-    image_button->setFixedWidth(100);
     image_button->setCheckable(true);
 
-    auto add_plot_button = new QPushButton("+ Plot", this);
-    add_plot_button->setFixedWidth(80);
+    add_plot_button = new QPushButton("+ Plot", this);
+    UpdateButtonWidths();
     add_plot_button->setToolTip("Open another dataset-info plot, side by side");
     add_plot_button->setStyleSheet(
         "QPushButton { background-color:#1F3A5F; color:white; font-weight:bold; border:none;"
@@ -62,10 +67,19 @@ JFJochViewerDatasetInfo::JFJochViewerDatasetInfo(QWidget *parent) : QWidget(pare
     stack = new QStackedWidget(this);
     chart_view = new JFJochDatasetInfoChartView(this);
     chart_view->setMinimumHeight(140);   // keep enough room for the axis labels even when compressed
+    chart_view2 = new JFJochDatasetInfoChartView(this);
+    chart_view2->hide();                 // only "Spots + background" shows the second plot
     grid_scan_image = new JFJochGridScanImage(this);
     image_chart = new JFJochViewerSidePanelChart(this);   // per-image profiles, folded in from the side panel
 
-    stack->addWidget(chart_view);
+    charts_holder = new QWidget(this);
+    auto *charts_layout = new QVBoxLayout(charts_holder);
+    charts_layout->setContentsMargins(0, 0, 0, 0);
+    charts_layout->setSpacing(0);
+    charts_layout->addWidget(chart_view);
+    charts_layout->addWidget(chart_view2);
+
+    stack->addWidget(charts_holder);
     stack->addWidget(grid_scan_image);
     stack->addWidget(image_chart);
 
@@ -74,11 +88,26 @@ JFJochViewerDatasetInfo::JFJochViewerDatasetInfo(QWidget *parent) : QWidget(pare
     connect(chart_view, &JFJochDatasetInfoChartView::imageSelected,
             this, &JFJochViewerDatasetInfo::imageSelectedInChart);
 
+    connect(chart_view2, &JFJochDatasetInfoChartView::imageSelected,
+            this, &JFJochViewerDatasetInfo::imageSelectedInChart);
+
+    connect(chart_view2, &JFJochDatasetInfoChartView::writeStatusBar,
+            [this](QString string, int timeout_ms) {
+                emit writeStatusBar(string, timeout_ms);
+            });
+
     connect(reset_button, &QPushButton::clicked,
             this, &JFJochViewerDatasetInfo::resetZoomButtonPressed);
 
     connect(combo_box, &QComboBox::currentIndexChanged,
             this, &JFJochViewerDatasetInfo::comboBoxSelected);
+    // activated (not currentIndexChanged) fires only on a user pick, which is exactly when the
+    // live default must stop overriding the selection - and when the saved favourite follows it.
+    connect(combo_box, &QComboBox::activated, this, [this](int) {
+        user_picked_ = true;
+        (combo_is_image_mode_ ? last_image_selection : last_selection) = combo_box->currentData().toInt();
+        SaveFavourite();
+    });
 
     connect(grid_scan_image, &JFJochGridScanImage::imageSelected,
             this, &JFJochViewerDatasetInfo::imageSelectedInChart);
@@ -95,20 +124,17 @@ JFJochViewerDatasetInfo::JFJochViewerDatasetInfo(QWidget *parent) : QWidget(pare
 
     connect(grid_button, &QPushButton::clicked,
             [this]() {
-                if (grid_button->isChecked()) {
-                    image_button->setChecked(false);
-                    combo_box->setEnabled(true);
-                }
-                UpdateView();
+                if (grid_button->isChecked())
+                    image_button->setChecked(false);   // leaves per-image mode: the combo must follow
+                ModeChanged();
+                SaveFavourite();
             });
     connect(image_button, &QPushButton::clicked,
             [this]() {
                 if (image_button->isChecked())
                     grid_button->setChecked(false);
-                UpdateLabels();                  // swap the one combo's contents for the mode
-                combo_box->setCurrentIndex(0);
-                comboBoxSelected(0);             // apply the first option of the new mode
-                UpdateView();
+                ModeChanged();
+                SaveFavourite();
             });
     connect(image_chart, &JFJochViewerSidePanelChart::writeStatusBar,
             [this](QString s, int t) { emit writeStatusBar(s, t); });
@@ -117,19 +143,109 @@ JFJochViewerDatasetInfo::JFJochViewerDatasetInfo(QWidget *parent) : QWidget(pare
 
 void JFJochViewerDatasetInfo::RestoreSelection() {
     QSignalBlocker bl(combo_box);
-    combo_box->setCurrentIndex(last_selection < combo_box->count() ? last_selection : 0);
+    // On a live source, spots against background is what says whether beam and crystal are still
+    // delivering, so that is where a live session starts - until the user picks something else.
+    const int live_default = combo_box->findData(SPOTS_PLUS_BACKGROUND);
+    if (!combo_is_image_mode_ && http_connected_ && !user_picked_ && live_default >= 0) {
+        combo_box->setCurrentIndex(live_default);
+        return;
+    }
+    // Each mode remembers its own selection by the item's data code: the two lists are unrelated,
+    // and a code survives the combo being rebuilt with a different item set - one that is no
+    // longer offered simply isn't found and the first item applies.
+    const int index = combo_box->findData(combo_is_image_mode_ ? last_image_selection : last_selection);
+    combo_box->setCurrentIndex(index >= 0 ? index : 0);
+}
+
+void JFJochViewerDatasetInfo::SaveFavourite() {
+    if (!dataset)
+        return;
+    QSettings settings("PSI", "jfjoch_viewer");
+    settings.beginGroup(FavouriteGroup(dataset->experiment.GetGridScan().has_value()));
+    settings.setValue("metric", last_selection);
+    settings.setValue("imagePlot", last_image_selection);
+    settings.setValue("perImage", image_button->isChecked());
+    settings.setValue("grid", grid_button->isChecked());
+}
+
+void JFJochViewerDatasetInfo::resetPlotDefaults() {
+    user_picked_ = false;
+    image_button->setChecked(false);
+    // A grid scan starts on its 2D map, like a first load with nothing saved.
+    grid_button->setChecked(dataset && dataset->experiment.GetGridScan().has_value());
+    UpdateLabels();       // rebuild the combo for per-dataset mode
+    last_selection = 0;   // default selections, after UpdateLabels captured the old ones
+    last_image_selection = 0;
+    RestoreSelection();
+    UpdatePlot();
+    UpdateView();
+}
+
+void JFJochViewerDatasetInfo::ApplyFavourite(bool grid_scan) {
+    QSettings settings("PSI", "jfjoch_viewer");
+    settings.beginGroup(FavouriteGroup(grid_scan));
+    image_button->setChecked(settings.value("perImage", false).toBool());
+    // With nothing saved, a grid scan starts on its 2D map.
+    grid_button->setChecked(settings.value("grid", grid_scan).toBool());
+    // ModeChanged's sequence, with the saved codes injected after UpdateLabels has captured the
+    // outgoing selection - the other way round the capture would overwrite them.
+    UpdateLabels();
+    last_selection = settings.value("metric", last_selection).toInt();
+    last_image_selection = settings.value("imagePlot", last_image_selection).toInt();
+    RestoreSelection();
+    if (combo_is_image_mode_)
+        comboBoxSelected(combo_box->currentIndex());
+    else
+        UpdatePlot();
+    UpdateView();
+}
+
+void JFJochViewerDatasetInfo::ModeChanged() {
+    UpdateLabels();          // swap the one combo's contents for the mode
+    RestoreSelection();
+    if (combo_is_image_mode_)
+        comboBoxSelected(combo_box->currentIndex());   // apply the per-image plot type
+    else
+        UpdatePlot();
+    UpdateView();
+}
+
+void JFJochViewerDatasetInfo::setHttpConnection(bool connected, QString) {
+    http_connected_ = connected;
+    if (!connected || user_picked_ || (image_button && image_button->isChecked()))
+        return;
+    RestoreSelection();   // the combo may still be empty; datasetLoaded() re-runs this either way
+    UpdatePlot();
+}
+
+// The buttons share one width so the row stays even. It is a character count rather than a pixel
+// count, so the labels still fit when the font grows (102 px at the default font, as good as the
+// 100 px it replaces).
+void JFJochViewerDatasetInfo::UpdateButtonWidths() {
+    const int char_width = fontMetrics().averageCharWidth();
+    reset_button->setFixedWidth(17 * char_width);
+    grid_button->setFixedWidth(17 * char_width);
+    image_button->setFixedWidth(17 * char_width);
+    add_plot_button->setFixedWidth(13 * char_width);
+}
+
+void JFJochViewerDatasetInfo::changeEvent(QEvent *event) {
+    QWidget::changeEvent(event);
+    if (event->type() == QEvent::FontChange)
+        UpdateButtonWidths();
 }
 
 void JFJochViewerDatasetInfo::UpdateLabels() {
     QSignalBlocker bl(combo_box);
 
     if (combo_box->count() > 0)
-        last_selection = combo_box->currentIndex();
+        (combo_is_image_mode_ ? last_image_selection : last_selection) = combo_box->currentData().toInt();
 
     combo_box->clear();
+    combo_is_image_mode_ = image_button && image_button->isChecked();
 
     // In per-image mode the one combo selects which per-image profile to show (no second combo).
-    if (image_button && image_button->isChecked()) {
+    if (combo_is_image_mode_) {
         for (const auto &pt : JFJochViewerSidePanelChart::PlotTypes())
             combo_box->addItem(pt.first, pt.second);
         return;
@@ -137,6 +253,7 @@ void JFJochViewerDatasetInfo::UpdateLabels() {
 
     if (this->dataset) {
         combo_box->addItem("Background estimate", 0);
+        combo_box->addItem("Spots + background", SPOTS_PLUS_BACKGROUND);
         combo_box->addItem("Ice ring score", 14);
         combo_box->addItem("Spindle blind fraction", 15);
         combo_box->addItem("Resolution estimate", 7);
@@ -189,6 +306,16 @@ void JFJochViewerDatasetInfo::UpdateLabels() {
 
 void JFJochViewerDatasetInfo::datasetLoaded(std::shared_ptr<const JFJochReaderDataset> dataset) {
     this->dataset = dataset;
+    // The first dataset of a kind (grid scan / standard) starts from the saved favourite for that
+    // kind - the user's last explicit plot choice and toggle states on such a dataset.
+    if (dataset) {
+        const bool grid_scan = dataset->experiment.GetGridScan().has_value();
+        if (favourite_kind_ != grid_scan) {
+            favourite_kind_ = grid_scan;
+            ApplyFavourite(grid_scan);   // rebuilds the combo for the favourite's mode and re-plots
+            return;
+        }
+    }
     // Per-image mode: the combo holds plot types and the chart follows the displayed image, so a
     // new dataset must not repopulate the combo or run the per-dataset plot.
     if (image_button && image_button->isChecked()) {
@@ -210,6 +337,7 @@ void JFJochViewerDatasetInfo::imageLoaded(std::shared_ptr<const JFJochReaderImag
     this->image = image;
     if (image) {
         chart_view->setImage(image->ImageData().number);
+        chart_view2->setImage(image->ImageData().number);
         grid_scan_image->setImage(image->ImageData().number);
     }
     image_chart->loadImage(image);   // per-image profile follows the displayed image
@@ -239,6 +367,7 @@ std::vector<float> JFJochViewerDatasetInfo::ExtractMetric(const JFJochReaderData
     else if (val == 13) data = ds.indexing_lattice_count;
     else if (val == 14) data = ds.ice_ring_score;
     else if (val == 15) data = ds.spindle_blind_fraction;
+    else if (val == SPOTS_PLUS_BACKGROUND) data = ds.spot_count;   // background is the secondary line, see UpdatePlot
     else if (val >= 100) {
         const int roi_index = (val - 100) / 4;
         if (val % 4 == 0) {
@@ -299,6 +428,14 @@ void JFJochViewerDatasetInfo::UpdatePlot() {
                             RunColor(static_cast<int>(runs_.size())), XForRun(*live_run_)});
     }
 
+    // "Spots + background": two half-height plots stacked in the same slot - the spot count on
+    // top (its x labels hidden), the background below, carrying the x axis for both.
+    const bool split = (val == SPOTS_PLUS_BACKGROUND);
+    if (split && !primary_color.isValid())
+        primary_color = RunColor(0);
+    chart_view->SetCompact(split ? QStringLiteral("Spots") : QString(), split);
+    chart_view2->setVisible(split);
+
     // The whole dataset spans this many images (the largest run, i.e. the original file), so the
     // x-axis is fixed to it and subset runs appear at their real position.
     int64_t full_range = dataset->experiment.GetImageNum();
@@ -309,11 +446,16 @@ void JFJochViewerDatasetInfo::UpdatePlot() {
     chart_view->loadValues(data, image_number, one_over_d2, dataset.get(), primary_name,
                            std::move(overlays), primary_color, XForRun(*dataset), full_range);
 
+    if (split) {
+        chart_view2->SetCompact(QStringLiteral("Bkg"), false);
+        chart_view2->loadValues(dataset->bkg_estimate, image_number, false, dataset.get(),
+                                QStringLiteral("Background"), {}, RunColor(1), XForRun(*dataset),
+                                full_range);
+    }
+
     if (dataset->experiment.GetGridScan()) {
         grid_scan_image->loadData(data, dataset->experiment.GetGridScan().value(), one_over_d2);
         grid_button->setEnabled(true);
-        if (!image_button->isChecked())
-            grid_button->setChecked(true);
     } else {
         grid_scan_image->clear();
         grid_button->setEnabled(false);
@@ -327,7 +469,7 @@ void JFJochViewerDatasetInfo::UpdateView() {
     else if (grid_button->isChecked() && dataset && dataset->experiment.GetGridScan())
         stack->setCurrentWidget(grid_scan_image);
     else
-        stack->setCurrentWidget(chart_view);
+        stack->setCurrentWidget(charts_holder);
 }
 
 void JFJochViewerDatasetInfo::runsChanged(QVector<RunData> runs, QString active_id) {
@@ -362,8 +504,10 @@ void JFJochViewerDatasetInfo::setColorMap(int color_map) {
 }
 
 void JFJochViewerDatasetInfo::resetZoomButtonPressed() {
-    if (stack->currentWidget() == grid_scan_image)
+    if (stack->currentWidget() == grid_scan_image) {
         grid_scan_image->fitToView();
-    else
+    } else {
         chart_view->resetZoom();
+        chart_view2->resetZoom();
+    }
 }
diff --git a/viewer/JFJochViewerDatasetInfo.h b/viewer/JFJochViewerDatasetInfo.h
index e2cae1c25..0397aeeaf 100644
--- a/viewer/JFJochViewerDatasetInfo.h
+++ b/viewer/JFJochViewerDatasetInfo.h
@@ -7,6 +7,8 @@
 #include <QStackedWidget>
 #include <QPushButton>
 
+#include <optional>
+
 #include "charts/JFJochDatasetInfoChartView.h"
 #include "../reader/JFJochReader.h"
 #include "image_viewer/JFJochGridScanImage.h"
@@ -17,6 +19,10 @@ class JFJochViewerDatasetInfo : public QWidget {
     Q_OBJECT
     QComboBox *combo_box;
     JFJochDatasetInfoChartView *chart_view;
+    // Second half-height plot under the first, shown only for "Spots + background": the spot
+    // count and the background each get their own compact plot instead of sharing twin axes.
+    JFJochDatasetInfoChartView *chart_view2;
+    QWidget *charts_holder;               // the two stacked chart views, as one stack page
     const std::vector<float> *GetDataset();
     std::shared_ptr<const JFJochReaderDataset> dataset;     // the active (primary) run
     std::shared_ptr<const JFJochReaderImage> image;
@@ -27,16 +33,35 @@ class JFJochViewerDatasetInfo : public QWidget {
     QString active_id_;                                     // which run is primary
     std::shared_ptr<const JFJochReaderDataset> live_run_;   // in-progress reprocessing, if any
 
+    bool http_connected_ = false;   // live source: default the plot to spots + background
+    bool user_picked_ = false;      // ... unless the user has picked a metric themselves
+
     QStackedWidget *stack = nullptr;
+    QPushButton *reset_button = nullptr;
     QPushButton *grid_button = nullptr;
     QPushButton *image_button = nullptr;   // toggle: show per-image profiles instead of the metric
+    QPushButton *add_plot_button = nullptr;
+    // The button row is sized in character widths, so it follows the font zoom.
+    void UpdateButtonWidths();
 
-    int last_selection;
+    int last_selection = 0;         // last per-dataset metric, by combo data code
+    int last_image_selection = 0;   // last per-image plot type, by combo data code
+    bool combo_is_image_mode_ = false;   // which of the two the combo currently lists
+    // Dataset kind (grid scan or not) whose saved favourite is applied; grid scans and standard
+    // scans each remember their own plot choice and toggle states across viewer restarts.
+    std::optional<bool> favourite_kind_;
+    void SaveFavourite();                  // persist the current choice for the loaded dataset's kind
+    void ApplyFavourite(bool grid_scan);   // apply the saved choice for that kind and re-plot
     void UpdatePlot();
+    // Rebuild the combo for whichever mode the toggles now select and re-plot. Every mode switch
+    // must go through this.
+    void ModeChanged();
     void UpdateView();   // pick the stack page from the grid / per-image toggles
     // Pull the metric selected by combo value `val` out of one run's dataset.
     std::vector<float> ExtractMetric(const JFJochReaderDataset &ds, int val, bool &one_over_d2) const;
 
+    void changeEvent(QEvent *event) override;
+
     void UpdateLabels();
     // Restores the combo selection after UpdateLabels() repopulated it, without firing
     // currentIndexChanged: the callers run UpdatePlot() themselves straight afterwards.
@@ -60,6 +85,10 @@ public slots:
     void runsChanged(QVector<RunData> runs, QString active_id);
     // Live results of the in-progress reprocessing run (updated as it goes), or nullptr to clear.
     void liveRunUpdated(std::shared_ptr<const JFJochReaderDataset> dataset);
+    // Connected to / disconnected from a live (HTTP) source.
+    void setHttpConnection(bool connected, QString addr = QString());
+    // "Reset all settings to defaults": back to the state a first load of this dataset would show.
+    void resetPlotDefaults();
 };
 
 
diff --git a/viewer/JFJochViewerMenu.cpp b/viewer/JFJochViewerMenu.cpp
index 0025bc7a7..b63f1a038 100644
--- a/viewer/JFJochViewerMenu.cpp
+++ b/viewer/JFJochViewerMenu.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "JFJochViewerMenu.h"
+#include "RemoteDisplayMode.h"
 
 #include <QMessageBox>
 #include <QApplication>
@@ -15,6 +16,9 @@
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QDockWidget>
+#include <QSettings>
+
+#include <algorithm>
 
 #include "JFJochViewerWindow.h"
 #include "windows/JFJochLicenseWindow.h"
@@ -77,6 +81,40 @@ JFJochViewerMenu::JFJochViewerMenu(QWidget *parent) : QMenuBar(parent) {
     viewMenu->addSeparator();
     const QAction *resetLayout = viewMenu->addAction("Reset layout");
     connect(resetLayout, &QAction::triggered, this, &JFJochViewerMenu::resetLayoutSelected);
+    const QAction *resetSettings = viewMenu->addAction("Reset all settings to defaults");
+    connect(resetSettings, &QAction::triggered, this, &JFJochViewerMenu::resetSettingsSelected);
+    viewMenu->addSeparator();
+    // Auto-detected from the session (ssh -X and the like); this toggle is the manual override.
+    QAction *remoteMode = viewMenu->addAction("Remote display mode (limit repaints)");
+    remoteMode->setCheckable(true);
+    remoteMode->setChecked(RemoteDisplayMode());
+    connect(remoteMode, &QAction::toggled, this, [](bool on) { SetRemoteDisplayMode(on); });
+
+    viewMenu->addSeparator();
+    // The desktop's own text scaling stays the primary mechanism, but few users know where it lives,
+    // so the viewer carries a zoom of its own. It multiplies the font the desktop handed us, so it
+    // composes with GNOME's "Large Text" or QT_SCALE_FACTOR instead of fighting them.
+    baseFont = QApplication::font();
+    QMenu *fontMenu = viewMenu->addMenu("Font size");
+    QAction *fontLarger = fontMenu->addAction("Larger");
+    fontLarger->setShortcuts({QKeySequence::ZoomIn,
+                              QKeySequence(Qt::ControlModifier | Qt::Key_Equal),
+                              QKeySequence(Qt::ControlModifier | Qt::KeypadModifier | Qt::Key_Plus)});
+    connect(fontLarger, &QAction::triggered, this, [this] { ApplyFontZoom(fontZoom + 25); });
+    QAction *fontSmaller = fontMenu->addAction("Smaller");
+    fontSmaller->setShortcuts({QKeySequence::ZoomOut,
+                               QKeySequence(Qt::ControlModifier | Qt::KeypadModifier | Qt::Key_Minus)});
+    connect(fontSmaller, &QAction::triggered, this, [this] { ApplyFontZoom(fontZoom - 25); });
+    fontMenu->addSeparator();
+    fontZoomGroup = new QActionGroup(this);
+    for (int percent: {100, 125, 150}) {
+        QAction *level = fontMenu->addAction(QString("%1 %").arg(percent));
+        level->setCheckable(true);
+        level->setData(percent);
+        fontZoomGroup->addAction(level);
+        connect(level, &QAction::triggered, this, [this, percent] { ApplyFontZoom(percent); });
+    }
+    ApplyFontZoom(QSettings("PSI", "jfjoch_viewer").value("fontZoom", 100).toInt());
 
     QMenu *helpMenu = addMenu("Help");
     // Add "About" action
@@ -93,6 +131,26 @@ JFJochViewerMenu::JFJochViewerMenu(QWidget *parent) : QMenuBar(parent) {
     connect(licensesAction, &QAction::triggered, this, &JFJochViewerMenu::licensesSelected);
 }
 
+// Three levels, 25 % apart: clamping here is what stops the two stepping actions at the ends.
+void JFJochViewerMenu::ApplyFontZoom(int percent) {
+    fontZoom = std::clamp(percent, 100, 150);
+    QFont font = baseFont;
+    font.setPointSizeF(baseFont.pointSizeF() * fontZoom / 100.0);
+    QApplication::setFont(font);
+    // setFont on its own only reaches widgets built after it. This is what carries the new size into
+    // the ones already on screen, and it keeps each widget's own attributes (a bold title stays bold).
+    QEvent font_change(QEvent::ApplicationFontChange);
+    for (QWidget *widget: QApplication::allWidgets())
+        QApplication::sendEvent(widget, &font_change);
+    QSettings("PSI", "jfjoch_viewer").setValue("fontZoom", fontZoom);
+    for (QAction *level: fontZoomGroup->actions())
+        level->setChecked(level->data().toInt() == fontZoom);
+}
+
+void JFJochViewerMenu::ResetFontZoom() {
+    ApplyFontZoom(100);
+}
+
 void JFJochViewerMenu::AddWindowEntry(JFJochHelperWindow *window, const QString &name) {
     auto action = windowMenu->addAction(name);
     action->setCheckable(true);
@@ -195,7 +253,9 @@ void JFJochViewerMenu::closeSelected() {
 }
 
 void JFJochViewerMenu::quitSelected() {
-    QApplication::quit();
+    // Through close(), not QApplication::quit(): closeEvent is where the persistent settings
+    // are saved, and quit() would bypass it.
+    window()->close();
 }
 
 
diff --git a/viewer/JFJochViewerMenu.h b/viewer/JFJochViewerMenu.h
index 82b926716..b55140d8c 100644
--- a/viewer/JFJochViewerMenu.h
+++ b/viewer/JFJochViewerMenu.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <QActionGroup>
+#include <QFont>
 #include <QMenuBar>
 
 #include "windows/JFJochHelperWindow.h"
@@ -22,6 +24,9 @@ class JFJochViewerMenu : public QMenuBar {
     QAction *toggleCalibrationWindowAction = nullptr;
 
     QMenu *windowMenu = nullptr;
+    QActionGroup *fontZoomGroup = nullptr;
+    QFont baseFont;              // the font the desktop handed us; the zoom is a multiple of it
+    int fontZoom = 100;          // per cent: 100, 125 or 150
     JFJochLicenseWindow *licenseWindow = nullptr;
     JFJochMouseShortcutsWindow *mouseShortcutsWindow = nullptr;
     JFJochAcknowledgementWindow *acknowledgementWindow = nullptr;
@@ -32,6 +37,8 @@ public:
     void AddWindowEntry(JFJochHelperWindow *window, const QString &name);
     // Adds a dock's show/hide toggle to the Window menu (for docked panels).
     void AddDockEntry(QDockWidget *dock, const QString &name);
+    // Back to 100 %, for "Reset all settings to defaults".
+    void ResetFontZoom();
 
 public slots:
     void openSelected();       // also reachable from the toolbar's open-dataset button
@@ -50,6 +57,7 @@ signals:
     void imageLayoutSelected();
     void processingLayoutSelected();
     void resetLayoutSelected();
+    void resetSettingsSelected();
 
 private slots:
     void aboutSelected();
@@ -64,4 +72,5 @@ private slots:
 
 private:
     void openLoadUserMaskTiff(bool replace);
+    void ApplyFontZoom(int percent);
 };
diff --git a/viewer/JFJochViewerWindow.cpp b/viewer/JFJochViewerWindow.cpp
index c48730c5b..857765049 100644
--- a/viewer/JFJochViewerWindow.cpp
+++ b/viewer/JFJochViewerWindow.cpp
@@ -7,7 +7,15 @@
 #include <QDockWidget>
 #include <QKeyEvent>
 #include <QGuiApplication>
+#include <QLineEdit>
+#include <QAbstractSpinBox>
+#include <QComboBox>
+#include <QTextEdit>
+#include <QPlainTextEdit>
+#include <QAbstractItemView>
+#include <limits>
 #include <QScreen>
+#include <QApplication>
 #include <QScrollArea>
 #include <QSettings>
 #include <QCloseEvent>
@@ -16,11 +24,15 @@
 #include <QPainter>
 #include <QPushButton>
 
+#include <utility>
+
 #include "JFJochImageReadingWorker.h"
+#include "RemoteDisplayMode.h"
+#include "../common/ColorScale.h"
 #include "image_viewer/JFJochDiffractionImage.h"
 #include "JFJochViewerSidePanel.h"
 #include "widgets/JFJochViewerSettingsDock.h"
-#include "widgets/JFJochViewerImageStrip.h"
+#include "widgets/JFJochViewerFileBrowser.h"
 #include "JFJochViewerStatusBar.h"
 #include "../common/CUDAWrapper.h"
 #include "../rugnux/RugnuxDefaults.h"
@@ -33,7 +45,6 @@
 #include "windows/JFJochViewerSpotListWindow.h"
 #include "windows/JFJochViewerReflectionListWindow.h"
 #include "windows/JFJochCalibrationWindow.h"
-#include "windows/JFJochViewerReciprocalSpaceWindow.h"
 #include "toolbar/JFJochViewerToolbarDisplay.h"
 #include "toolbar/JFJochViewerToolbarImage.h"
 #include "windows/JFJoch2DAzintImageWindow.h"
@@ -46,9 +57,13 @@
 // Dock-layout version for saveState/restoreState: bump whenever the dock set / structure changes so a
 // stale saved layout (which can restore a dock as a broken, non-responsive floating window) is rejected
 // and the default layout applies instead.
-static constexpr int kLayoutVersion = 2;
+static constexpr int kLayoutVersion = 4;
 
 JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString &file) : QMainWindow(parent) {
+    image_tail_timer_ = new QTimer(this);
+    image_tail_timer_->setSingleShot(true);
+    connect(image_tail_timer_, &QTimer::timeout, this, &JFJochViewerWindow::DeliverPendingImage);
+
     menuBar = new JFJochViewerMenu(this);
     setMenuBar(menuBar);
 
@@ -113,23 +128,22 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
 
     // Central area: the diffraction image. Everything else (inspector, plots, processing) is a
     // dock, so the layout can be rearranged, saved, and switched between perspectives.
-    auto viewer = new JFJochDiffractionImage(this);
+    viewer = new JFJochDiffractionImage(this);
     viewer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     setCentralWidget(viewer);
 
     auto side_panel = new JFJochViewerSidePanel(this);
-    auto side_panel_scroll = new QScrollArea(this);
-    side_panel_scroll->setWidget(side_panel);
-    side_panel_scroll->setWidgetResizable(true);
-    side_panel_scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    side_panel_scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-    side_panel_scroll->setMinimumWidth(450);
-    side_panel_scroll->setMaximumWidth(600);
+    inspectorScroll = new QScrollArea(this);
+    inspectorScroll->setWidget(side_panel);
+    inspectorScroll->setWidgetResizable(true);
+    inspectorScroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    inspectorScroll->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    UpdateInspectorWidth();
 
     inspectorDock = new QDockWidget("Inspector", this);
     inspectorDock->setObjectName("inspectorDock");
     inspectorDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-    inspectorDock->setWidget(side_panel_scroll);
+    inspectorDock->setWidget(inspectorScroll);
     addDockWidget(Qt::RightDockWidgetArea, inspectorDock);
     menuBar->AddDockEntry(inspectorDock, "Inspector");
 
@@ -143,7 +157,6 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     auto spotWindow = new JFJochViewerSpotListWindow(this);
     auto reflectionWindow = new JFJochViewerReflectionListWindow(this);
     auto calibrationWindow = new JFJochCalibrationWindow(this);
-    auto reciprocalWindow = new JFJochViewerReciprocalSpaceWindow(this);
 
     auto azintImageWindow = new JFJoch2DAzintImageWindow(this);
     auto magnifierWindow = new JFJochMagnifierWindow(this);
@@ -158,7 +171,6 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     menuBar->AddWindowEntry(reflectionWindow, "Reflection list");
     menuBar->AddWindowEntry(metadataWindow, "Image metadata");
     menuBar->AddWindowEntry(calibrationWindow, "Calibration image viewer");
-    menuBar->AddWindowEntry(reciprocalWindow, "Reciprocal space viewer");
     menuBar->AddWindowEntry(azintImageWindow, "Azimuthal integration 2D image");
     menuBar->AddWindowEntry(magnifierWindow, "Magnifier");
     // processingJobsWindow is docked (bottom, next to the plots), not a standalone window - see below.
@@ -189,6 +201,8 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
 
     connect(menuBar, &JFJochViewerMenu::fileOpenSelected,
             reading_worker, &JFJochImageReadingWorker::LoadFile);
+    connect(menuBar, &JFJochViewerMenu::fileOpenSelected,
+            this, &JFJochViewerWindow::FollowInFileBrowser);
 
     connect(menuBar, &JFJochViewerMenu::fileCloseSelected,
             reading_worker, &JFJochImageReadingWorker::CloseFile);
@@ -229,6 +243,12 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     connect(toolBarDisplay, &JFJochViewerToolbarDisplay::setForeground, viewer,
             &JFJochDiffractionImage::changeForeground);
 
+    connect(toolBarDisplay, &JFJochViewerToolbarDisplay::setBackground, viewer,
+            &JFJochDiffractionImage::changeBackground);
+
+    connect(viewer, &JFJochDiffractionImage::backgroundChanged,
+            toolBarDisplay, &JFJochViewerToolbarDisplay::updateBackground);
+
     connect(viewer, &JFJochDiffractionImage::autoForegroundChanged,
             toolBarDisplay, &JFJochViewerToolbarDisplay::updateAutoForeground);
 
@@ -391,23 +411,9 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     connect(reading_worker, &JFJochImageReadingWorker::simpleImageLoaded,
             calibrationWindow, &JFJochCalibrationWindow::calibrationLoaded);
 
-    connect(this, &JFJochViewerWindow::datasetReady,
-            reciprocalWindow, &JFJochViewerReciprocalSpaceWindow::datasetLoaded);
-    connect(this, &JFJochViewerWindow::imageReady,
-            reciprocalWindow, &JFJochViewerReciprocalSpaceWindow::imageLoaded);
 
-    connect(reciprocalWindow, &JFJochViewerReciprocalSpaceWindow::loadSpotsRequest,
-            reading_worker, &JFJochImageReadingWorker::LoadSpots);
-    connect(reading_worker, &JFJochImageReadingWorker::spotsLoaded,
-            reciprocalWindow, &JFJochViewerReciprocalSpaceWindow::spotsLoaded);
 
-    connect(reciprocalWindow, &JFJochHelperWindow::zoom,
-            viewer, &JFJochDiffractionImage::centerOnSpot);
 
-    connect(side_panel, &JFJochViewerSidePanel::setSpotColor,
-            reciprocalWindow, &JFJochViewerReciprocalSpaceWindow::setSpotColor);
-    connect(side_panel, &JFJochViewerSidePanel::setFeatureColor,
-            reciprocalWindow, &JFJochViewerReciprocalSpaceWindow::setFeatureColor);
 
     connect(azintImageWindow, &JFJoch2DAzintImageWindow::zoomOnBin,
             viewer, &JFJochDiffractionImage::centerOnSpot);
@@ -415,7 +421,7 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     // --- Magnifier ---
     // The magnifier shows the frame the main view has already rendered - the same pixels with
     // its own zoom and centre - so it neither converts nor colours anything itself.
-    connect(viewer, &JFJochImage::frameRendered, magnifierWindow, [viewer, magnifierWindow] {
+    connect(viewer, &JFJochImage::frameRendered, magnifierWindow, [this, magnifierWindow] {
         magnifierWindow->setFrame(viewer->Frame());
     });
 
@@ -446,9 +452,21 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     connect(this, &JFJochViewerWindow::adjustForegroundButton,
             viewer, &JFJochDiffractionImage::adjustForeground);
 
+    connect(this, &JFJochViewerWindow::adjustBackgroundButton,
+            viewer, &JFJochDiffractionImage::adjustBackground);
+
     connect(this, &JFJochViewerWindow::setAutoForeground,
             viewer, &JFJochDiffractionImage::setAutoForeground);
 
+    connect(this, &JFJochViewerWindow::oneShotAutoForeground,
+            viewer, &JFJochDiffractionImage::oneShotAutoForeground);
+
+    connect(this, &JFJochViewerWindow::stepImage,
+            toolBarImage, &JFJochViewerToolbarImage::stepImage);
+
+    // See eventFilter: window-wide keyboard shortcuts, whatever widget has the focus.
+    qApp->installEventFilter(this);
+
     // Processing jobs: run rugnux locally / copy a cluster command line, and surface
     // finished runs as switchable dataset snapshots.
     connect(processingJobsWindow, &JFJochProcessingJobsWindow::registerSnapshot,
@@ -493,12 +511,27 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     settingsScroll->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     settingsScroll->setMinimumWidth(330);
     settingsScroll->setMaximumWidth(480);
-    settingsDock = new QDockWidget("Settings", this);
+    settingsDock = new QDockWidget("Processing", this);
     settingsDock->setObjectName("settingsDock");
     settingsDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     settingsDock->setWidget(settingsScroll);   // scrollable: don't force the window taller than the screen
     addDockWidget(Qt::LeftDockWidgetArea, settingsDock);
-    menuBar->AddDockEntry(settingsDock, "Settings");
+    menuBar->AddDockEntry(settingsDock, "Processing");
+
+    // Files panel: an alternative to the processing panel in the same left-hand slot, tabbed together (the
+    // canonical Qt way to offer two panels one on top of the other without doubling the width) - most
+    // beamline users care about opening images, not reprocessing settings, so this one starts on top.
+    auto *fileBrowser = new JFJochViewerFileBrowser(this);
+    fileBrowserDock = new QDockWidget("Files", this);
+    fileBrowserDock->setObjectName("fileBrowserDock");
+    fileBrowserDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+    fileBrowserDock->setWidget(fileBrowser);
+    addDockWidget(Qt::LeftDockWidgetArea, fileBrowserDock);
+    tabifyDockWidget(settingsDock, fileBrowserDock);
+    fileBrowserDock->raise();
+    menuBar->AddDockEntry(fileBrowserDock, "Files");
+    connect(fileBrowser, &JFJochViewerFileBrowser::openDataset,
+            reading_worker, &JFJochImageReadingWorker::LoadFile);
 
     connect(settingsPanel, &JFJochViewerSettingsDock::spotFindingChanged,
             reading_worker, &JFJochImageReadingWorker::UpdateSpotFindingSettings);
@@ -531,9 +564,9 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     connect(reading_worker, &JFJochImageReadingWorker::referenceMtzChanged,
             settingsPanel, &JFJochViewerSettingsDock::referenceLoaded);
 
-    // Processing panel: hidden by default and narrower; it reveals itself (to the right of the
+    // Jobs panel: hidden by default and narrower; it reveals itself (to the right of the
     // plots) only when a reprocessing job starts.
-    processingDock = new QDockWidget("Processing", this);
+    processingDock = new QDockWidget("Jobs", this);
     processingDock->setObjectName("processingDock");
     // Allow any area so dragging it out (floating) and re-docking behave; the table's natural width
     // (its columns) must not pin the dock wide, so let it fold like the settings dock.
@@ -548,47 +581,19 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
         resizeDocks({lastDatasetInfoDock, processingDock}, {900, 280}, Qt::Horizontal);
     }
     processingDock->hide();
-    menuBar->AddDockEntry(processingDock, "Processing");
+    menuBar->AddDockEntry(processingDock, "Jobs");
     connect(processingJobsWindow, &JFJochProcessingJobsWindow::jobStarted, this, [this] {
         processingDock->show();
         processingDock->raise();
     });
 
-    // Image strip / hit feed: thumbnails of representative images, rendered off-thread; click opens.
-    // Stacked below the plots — both want vertical room, and the strip needs less of it.
-    auto *imageStrip = new JFJochViewerImageStrip(this);
-    imageStripDock = new QDockWidget("Image strip", this);
-    imageStripDock->setObjectName("imageStripDock");
-    imageStripDock->setWidget(imageStrip);
-    addDockWidget(Qt::BottomDockWidgetArea, imageStripDock);
-    if (lastDatasetInfoDock) {
-        splitDockWidget(lastDatasetInfoDock, imageStripDock, Qt::Vertical);
-        resizeDocks({lastDatasetInfoDock, imageStripDock}, {260, 140}, Qt::Vertical);
-    }
-    menuBar->AddDockEntry(imageStripDock, "Image strip");
-    connect(this, &JFJochViewerWindow::datasetReady,
-            imageStrip, &JFJochViewerImageStrip::datasetLoaded);
-    connect(reading_worker, &JFJochImageReadingWorker::fileOpened,
-            imageStrip, &JFJochViewerImageStrip::resetForNewFile);
-    connect(imageStrip, &JFJochViewerImageStrip::requestThumbnails,
-            reading_worker, &JFJochImageReadingWorker::RenderThumbnails);
-    connect(reading_worker, &JFJochImageReadingWorker::thumbnailReady,
-            imageStrip, &JFJochViewerImageStrip::thumbnailReady);
-    connect(imageStrip, &JFJochViewerImageStrip::imageSelected,
-            reading_worker, &JFJochImageReadingWorker::LoadImage);
-    connect(toolBarDisplay, &JFJochViewerToolbarDisplay::colorMapChanged,
-            reading_worker, &JFJochImageReadingWorker::SetThumbnailColorMap);
-    connect(side_panel, &JFJochViewerSidePanel::setFeatureColor,
-            reading_worker, &JFJochImageReadingWorker::SetThumbnailFeatureColor);
-    connect(side_panel, &JFJochViewerSidePanel::setSpotColor,
-            reading_worker, &JFJochImageReadingWorker::SetThumbnailSpotColor);
-
     connect(menuBar, &JFJochViewerMenu::imageLayoutSelected, this,
             [this] { ApplyPerspective(Perspective::Image); });
     connect(menuBar, &JFJochViewerMenu::processingLayoutSelected, this,
             [this] { ApplyPerspective(Perspective::Processing); });
     connect(menuBar, &JFJochViewerMenu::resetLayoutSelected, this,
             [this] { if (!defaultLayoutState.isEmpty()) restoreState(defaultLayoutState, kLayoutVersion); });
+    connect(menuBar, &JFJochViewerMenu::resetSettingsSelected, this, &JFJochViewerWindow::ResetAllSettings);
 
     // Tear-off floating is disabled for all docks: a floated QDockWidget is unreliable across platforms
     // (on WSLg it becomes an off-screen, override-redirect window that can't be focused or recovered, so
@@ -603,6 +608,18 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     restoreGeometry(settings.value("geometry").toByteArray());
     restoreState(settings.value("windowState").toByteArray(), kLayoutVersion);
 
+    // Display settings (color map, Auto, HDR) persist across sessions the same way the layout does.
+    const int colorMap = settings.value("colorMap", static_cast<int>(ColorScaleEnum::Indigo)).toInt();
+    viewer->setColorMap(colorMap);
+    toolBarDisplay->updateColorMap(colorMap);
+
+    const bool autoForeground = settings.value("autoForeground", false).toBool();
+    viewer->setAutoForeground(autoForeground);   // emits autoForegroundChanged -> toolbar button state
+
+    const bool hdrMode = settings.value("hdrMode", false).toBool();
+    viewer->setHDRMode(hdrMode);
+    toolBarDisplay->updateHDRMode(hdrMode);
+
     if (!file.isEmpty())
         LoadFile(file, 0, 1, false);
 }
@@ -615,27 +632,88 @@ JFJochViewerWindow::~JFJochViewerWindow() {
 }
 
 void JFJochViewerWindow::ApplyPerspective(Perspective p) {
-    // Image: just the image + inspector. Processing: also settings, dataset-info plots, jobs panel.
+    // Image: just the image + inspector (+ file manager, on top of its tab with Processing).
+    // Processing: also dataset-info plots and the jobs panel, with the processing panel raised instead.
     const bool processing = (p == Perspective::Processing);
     if (inspectorDock) inspectorDock->setVisible(true);
-    if (settingsDock) settingsDock->setVisible(processing);
-    if (imageStripDock) imageStripDock->setVisible(processing);
+    // Processing and the file manager stay tabbed together either way; only which one is on top changes.
+    if (settingsDock) settingsDock->setVisible(true);
+    if (fileBrowserDock) fileBrowserDock->setVisible(true);
+    (processing ? settingsDock : fileBrowserDock)->raise();
     if (processingDock && !processing) processingDock->hide();   // shows only when a job starts
     for (auto *d : findChildren<QDockWidget *>())
         if (d->objectName().startsWith("datasetInfoDock"))
             d->setVisible(processing);
 }
 
+void JFJochViewerWindow::ResetAllSettings() {
+    const auto reply = QMessageBox::question(
+        this, "Reset all settings",
+        "Reset all viewer settings to defaults - window layout, display settings, plot choices "
+        "and the file manager root?",
+        QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+    if (reply != QMessageBox::Yes)
+        return;
+    QSettings("PSI", "jfjoch_viewer").clear();
+
+    // Bring the running session to the state a first start builds, so normal saving on close is
+    // correct again afterwards. Same calls as the constructor, in the same order.
+    if (!defaultLayoutState.isEmpty())
+        restoreState(defaultLayoutState, kLayoutVersion);
+    showNormal();
+    const QRect avail = QGuiApplication::primaryScreen()->availableGeometry();
+    resize(qMin(1200, avail.width() - 100), qMin(1100, avail.height() - 100));
+
+    viewer->setColorMap(static_cast<int>(ColorScaleEnum::Indigo));
+    toolBarDisplay->updateColorMap(static_cast<int>(ColorScaleEnum::Indigo));
+    viewer->setAutoForeground(false);   // emits autoForegroundChanged -> toolbar button state
+    viewer->setHDRMode(false);
+    toolBarDisplay->updateHDRMode(false);
+
+    for (auto *info : findChildren<JFJochViewerDatasetInfo *>())
+        info->resetPlotDefaults();
+    for (auto *browser : findChildren<JFJochViewerFileBrowser *>())
+        browser->ResetToDefaultRoot();
+    menuBar->ResetFontZoom();
+}
+
+// The inspector's width bounds are a character count, not a pixel count, so the value column keeps
+// up with the text - the View menu's font zoom or the desktop's scaling. At the default font this
+// is the 450/600 px it has always been. The count comes from the application font rather than the
+// scroll area's: on a font change the window is told before its children are.
+void JFJochViewerWindow::UpdateInspectorWidth() {
+    const int char_width = QFontMetrics(QApplication::font()).averageCharWidth();
+    inspectorScroll->setMinimumWidth(75 * char_width);
+    inspectorScroll->setMaximumWidth(100 * char_width);
+}
+
+void JFJochViewerWindow::changeEvent(QEvent *event) {
+    QMainWindow::changeEvent(event);
+    // The menu bar sets the application font while the window is still being built, so the inspector
+    // is not there yet on the first one.
+    if (event->type() == QEvent::FontChange && inspectorScroll)
+        UpdateInspectorWidth();
+}
+
 void JFJochViewerWindow::closeEvent(QCloseEvent *event) {
     // Persist the dock/toolbar arrangement and window geometry so the next launch resumes it.
     QSettings settings("PSI", "jfjoch_viewer");
     settings.setValue("geometry", saveGeometry());
     settings.setValue("windowState", saveState(kLayoutVersion));
+    settings.setValue("colorMap", toolBarDisplay->colorMap());
+    settings.setValue("autoForeground", toolBarDisplay->autoForeground());
+    settings.setValue("hdrMode", toolBarDisplay->hdrMode());
     QMainWindow::closeEvent(event);
 }
 
 void JFJochViewerWindow::LoadFile(const QString &filename, qint64 image_number, qint64 summation, bool retry) {
     emit LoadFileRequest(filename, image_number, summation, true);
+    FollowInFileBrowser(filename);
+}
+
+void JFJochViewerWindow::FollowInFileBrowser(const QString &filename) {
+    for (auto *browser : findChildren<JFJochViewerFileBrowser *>())
+        browser->FollowPath(filename);
 }
 
 void JFJochViewerWindow::LoadImage(qint64 image_number, qint64 summation) {
@@ -644,10 +722,34 @@ void JFJochViewerWindow::LoadImage(qint64 image_number, qint64 summation) {
 
 void JFJochViewerWindow::OnImageReady(std::shared_ptr<const JFJochReaderImage> image) {
     lastImage = image;          // newest frame, for dataset-info docks opened later
+
+    // On a remote display every frame shown is a full-window upload, so a fast producer (live
+    // follow, movie playback, scrubbing) is displayed at the hover cadence: only the newest frame
+    // is kept and the intermediates go undisplayed. The ack is still per frame - the in-flight
+    // counter is all it feeds - so the producer never waits on the display.
+    if (RemoteDisplayMode()) {
+        pendingImage = std::move(image);
+        if (!image_rate_.isValid() || image_rate_.elapsed() >= kRemoteRepaintIntervalMs) {
+            image_tail_timer_->stop();
+            DeliverPendingImage();
+        } else {
+            image_tail_timer_->start(kRemoteRepaintIntervalMs);
+        }
+        emit imageConsumed();
+        return;
+    }
+
     emit imageReady(image);     // fan out to every GUI consumer synchronously (same thread)
     emit imageConsumed();       // ack the worker so it may fetch/produce the next frame
 }
 
+void JFJochViewerWindow::DeliverPendingImage() {
+    image_rate_.restart();
+    if (!pendingImage)
+        return;
+    emit imageReady(std::exchange(pendingImage, nullptr));
+}
+
 void JFJochViewerWindow::OnDatasetReady(std::shared_ptr<const JFJochReaderDataset> dataset) {
     lastDataset = dataset;      // newest dataset, for dataset-info docks opened later
     emit datasetReady(dataset); // fan out to every GUI consumer synchronously (same thread)
@@ -685,6 +787,9 @@ void JFJochViewerWindow::NewDatasetInfo() {
     // Live processing results: the in-progress run as its own overlay line.
     connect(processingJobsWindow, &JFJochProcessingJobsWindow::liveDataset,
             info, &JFJochViewerDatasetInfo::liveRunUpdated);
+    // A live (HTTP) source defaults the plot to spots + background.
+    connect(reading_worker, &JFJochImageReadingWorker::httpConnectionChanged,
+            info, &JFJochViewerDatasetInfo::setHttpConnection);
     connect(info, &JFJochViewerDatasetInfo::imageSelected,
             reading_worker, &JFJochImageReadingWorker::LoadImage);
     connect(info, &JFJochViewerDatasetInfo::addPlot, this, &JFJochViewerWindow::NewDatasetInfo);
@@ -694,27 +799,48 @@ void JFJochViewerWindow::NewDatasetInfo() {
             statusbar, &JFJochViewerStatusBar::display);
 }
 
-void JFJochViewerWindow::keyPressEvent(QKeyEvent *event) {
-        if (event->key() == Qt::Key_F) {
-                emit adjustForegroundButton(true);
-                event->accept();
-                return;
+bool JFJochViewerWindow::eventFilter(QObject *obj, QEvent *event) {
+    // The filter sees every key of this window before the focused widget does, so F/B/A and the
+    // frame-navigation keys work with any panel focused, not only the image. It steps aside when
+    // the focused widget genuinely uses the key: any text-entry widget for all of them, item
+    // views (the file tree) for the navigation keys, and everything while a popup is open.
+    const auto type = event->type();
+    if ((type == QEvent::KeyPress || type == QEvent::KeyRelease)
+            && QApplication::activeWindow() == this && !QApplication::activePopupWidget()) {
+        const auto *ke = static_cast<QKeyEvent *>(event);
+        const int key = ke->key();
+        QWidget *focus = QApplication::focusWidget();
+        const bool editing = qobject_cast<QLineEdit *>(focus) || qobject_cast<QAbstractSpinBox *>(focus)
+                          || qobject_cast<QComboBox *>(focus) || qobject_cast<QTextEdit *>(focus)
+                          || qobject_cast<QPlainTextEdit *>(focus);
+        const bool plain = (ke->modifiers() & ~Qt::KeypadModifier) == Qt::NoModifier;
+        if (!editing && plain) {
+            if (type == QEvent::KeyPress) {
+                switch (key) {
+                    case Qt::Key_F: emit adjustForegroundButton(true); return true;
+                    case Qt::Key_B: emit adjustBackgroundButton(true); return true;
+                    case Qt::Key_A:
+                        if (!ke->isAutoRepeat())
+                            emit oneShotAutoForeground();
+                        return true;
+                    default: break;
+                }
+                if (!qobject_cast<QAbstractItemView *>(focus)) {
+                    switch (key) {
+                        case Qt::Key_Home: emit stepImage(std::numeric_limits<int>::min()); return true;
+                        case Qt::Key_End:  emit stepImage(std::numeric_limits<int>::max()); return true;
+                        case Qt::Key_PageUp:   emit stepImage(1); return true;
+                        case Qt::Key_PageDown: emit stepImage(-1); return true;
+                        default: break;
+                    }
+                }
+            } else {
+                if (key == Qt::Key_F) { emit adjustForegroundButton(false); return true; }
+                if (key == Qt::Key_B) { emit adjustBackgroundButton(false); return true; }
+            }
         }
-        if (event->key() == Qt::Key_A && ! event->isAutoRepeat()) {
-                emit setAutoForeground(true);
-                event->accept();
-                return;
-        }
-        QMainWindow::keyPressEvent(event);
-}
-
-void JFJochViewerWindow::keyReleaseEvent(QKeyEvent *event) {
-        if (event->key() == Qt::Key_F) {
-                emit adjustForegroundButton(false);
-                event->accept();
-                return;
-        }
-        QMainWindow::keyReleaseEvent(event);
+    }
+    return QMainWindow::eventFilter(obj, event);
 }
 
 void JFJochViewerWindow::OnFileLoadError(QString title, QString message) {
diff --git a/viewer/JFJochViewerWindow.h b/viewer/JFJochViewerWindow.h
index c9f8b734f..86cabdb34 100644
--- a/viewer/JFJochViewerWindow.h
+++ b/viewer/JFJochViewerWindow.h
@@ -3,8 +3,10 @@
 
 #pragma once
 
+#include <QElapsedTimer>
 #include <QMainWindow>
 #include <QProgressDialog>
+#include <QTimer>
 
 #include "JFJochViewerMenu.h"
 #include "../reader/JFJochHDF5Reader.h"
@@ -14,7 +16,9 @@
 #include "toolbar/JFJochViewerToolbarDisplay.h"
 
 class JFJochProcessingJobsWindow;
+class JFJochDiffractionImage;
 class QDockWidget;
+class QScrollArea;
 
 class JFJochViewerWindow : public QMainWindow {
 Q_OBJECT
@@ -27,12 +31,20 @@ public:
 private:
     JFJochViewerMenu *menuBar;
     JFJochImageReadingWorker *reading_worker;
+    JFJochDiffractionImage *viewer;               // central diffraction image
     JFJochViewerToolbarDisplay *toolBarDisplay;
     JFJochViewerStatusBar *statusbar;
     JFJochProcessingJobsWindow *processingJobsWindow;
 
     std::shared_ptr<const JFJochReaderDataset> lastDataset;  // added
     std::shared_ptr<const JFJochReaderImage> lastImage;      // added
+
+    // Remote-display frame throttle (see OnImageReady): the newest frame not yet fanned out,
+    // delivered at most every kRemoteRepaintIntervalMs while a fast producer runs.
+    std::shared_ptr<const JFJochReaderImage> pendingImage;
+    QElapsedTimer image_rate_;
+    QTimer *image_tail_timer_ = nullptr;
+    void DeliverPendingImage();
     QVector<RunData> lastRuns;                               // for dataset-info docks opened later
     QString lastActiveRunId;
 
@@ -40,21 +52,32 @@ private:
 
     QDockWidget *lastDatasetInfoDock = nullptr;   // most recent dataset-info dock, for docking layout
     QDockWidget *inspectorDock = nullptr;         // image inspector (former right-hand side panel)
+    QScrollArea *inspectorScroll = nullptr;       // its scroll area; width bounds follow the font
     QDockWidget *settingsDock = nullptr;          // inline MX/AzInt settings panel
+    QDockWidget *fileBrowserDock = nullptr;       // data-root directory tree, tabbed with settingsDock
     QDockWidget *processingDock = nullptr;        // processing jobs panel
-    QDockWidget *imageStripDock = nullptr;        // thumbnail strip / hit feed
     QByteArray defaultLayoutState;                // captured after construction, for "Reset layout"
     int datasetInfoCounter = 0;                   // gives each dataset-info dock a unique objectName
 
+    void ResetAllSettings();
+    void UpdateInspectorWidth();
+
+    // Both ways of opening a dataset from outside the file manager - the File menu and D-Bus -
+    // come through here, so the browser follows the same way for either.
+    void FollowInFileBrowser(const QString &filename);
+
     QThread *reading_thread;
 
     // Named layouts. Image = just the image + inspector; Processing = also the plots + jobs panel.
     enum class Perspective { Image, Processing };
     void ApplyPerspective(Perspective p);
 
-    void keyPressEvent(QKeyEvent *event) override;
-    void keyReleaseEvent(QKeyEvent *event) override;
+    // Keyboard shortcuts (F/B/A, Home/End/PageUp/PageDown) are handled in an application-wide
+    // event filter rather than keyPressEvent, so they work wherever the focus happens to be,
+    // stepping aside when the focused widget genuinely uses the key (text entry, item views).
+    bool eventFilter(QObject *obj, QEvent *event) override;
     void closeEvent(QCloseEvent *event) override;
+    void changeEvent(QEvent *event) override;
 
 private slots:
     // Single cross-thread sink for the worker's imageLoaded: fans out to every GUI consumer
@@ -87,6 +110,10 @@ signals:
     void LoadFileRequest(const QString &filename, qint64 image_number, qint64 summation, bool retry);
     void LoadImageRequest(int64_t image_number, int64_t summation);
     void adjustForegroundButton(bool input);
+    void adjustBackgroundButton(bool input);
     void setAutoForeground(bool val);
+    void oneShotAutoForeground();
+    // Re-emitted by the shortcut filter; the navigation toolbar applies the step, clamped.
+    void stepImage(int steps);
 };
 
diff --git a/viewer/RemoteDisplayMode.cpp b/viewer/RemoteDisplayMode.cpp
new file mode 100644
index 000000000..35895ce9e
--- /dev/null
+++ b/viewer/RemoteDisplayMode.cpp
@@ -0,0 +1,38 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "RemoteDisplayMode.h"
+
+#include <QGuiApplication>
+
+static bool DetectRemoteDisplay() {
+    const QByteArray env = qgetenv("JFJOCH_VIEWER_REMOTE");
+    if (!env.isEmpty())
+        return env != "0" && env.compare("false", Qt::CaseInsensitive) != 0;
+
+    // Wayland, Windows and macOS sessions are local by construction.
+    if (QGuiApplication::platformName() != QLatin1String("xcb"))
+        return false;
+
+    // A DISPLAY with a host part goes over a socket that carries every pixel:
+    // "localhost:10.0" is SSH forwarding, "host:0" is raw remote X. A local display
+    // is ":0"-style ("unix:0" is a legacy spelling of the same thing).
+    const QByteArray display = qgetenv("DISPLAY");
+    const auto colon = display.indexOf(':');
+    if (colon <= 0)
+        return false;
+    return display.left(colon) != "unix";
+}
+
+static bool &ActiveFlag() {
+    static bool active = DetectRemoteDisplay();
+    return active;
+}
+
+bool RemoteDisplayMode() {
+    return ActiveFlag();
+}
+
+void SetRemoteDisplayMode(bool active) {
+    ActiveFlag() = active;
+}
diff --git a/viewer/RemoteDisplayMode.h b/viewer/RemoteDisplayMode.h
new file mode 100644
index 000000000..82d7ceb26
--- /dev/null
+++ b/viewer/RemoteDisplayMode.h
@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+// Whether the viewer talks to its display server across a network link (ssh -X and the like).
+// On such a link every repaint is shipped as pixels, so interactions that repaint per input
+// event are throttled to the hover cadence instead. Detected once from the session; the
+// JFJOCH_VIEWER_REMOTE environment variable (0/1) and the View-menu toggle override it.
+// Only call after QApplication exists - detection reads the platform name.
+bool RemoteDisplayMode();
+void SetRemoteDisplayMode(bool active);
+
+// The cadence remote-throttled updates run at, chosen to match JFJochImage's hover rate limit:
+// far below the input event rate, above what the eye follows.
+constexpr int kRemoteRepaintIntervalMs = 66;
diff --git a/viewer/charts/JFJochDatasetInfoChartView.cpp b/viewer/charts/JFJochDatasetInfoChartView.cpp
index 1e65b1b85..c203e94bc 100644
--- a/viewer/charts/JFJochDatasetInfoChartView.cpp
+++ b/viewer/charts/JFJochDatasetInfoChartView.cpp
@@ -10,13 +10,22 @@
 
 #include "JFJochDatasetInfoChartView.h"
 
+namespace {
+    // Qt Charts draws its curves 2 px wide, which is hard to follow across a desk. Take the weight
+    // from the font, so a zoomed-up UI gets a proportionally heavier line (~3 px at the default font).
+    void setSeriesPenWidth(QLineSeries *line, int font_height) {
+        QPen pen = line->pen();
+        pen.setWidthF(font_height / 5.0);
+        line->setPen(pen);
+    }
+}
+
 JFJochDatasetInfoChartView::JFJochDatasetInfoChartView(QWidget *parent)
     : QChartView(new QChart(), parent) {
     chart()->legend()->hide();
-    // Reclaim Qt Charts' outer layout padding and trim the inner margins so the axis labels keep
-    // their room even when the dock is short (otherwise they are the first thing Qt drops).
+    // Reclaim Qt Charts' outer layout padding so the axis labels keep their room even when the dock
+    // is short (otherwise they are the first thing Qt drops); the inner margins are set per rebuild.
     chart()->layout()->setContentsMargins(0, 0, 0, 0);
-    chart()->setMargins(QMargins(2, 10, 8, 2));   // top room so the highest Y label is not clipped
     chart()->setBackgroundRoundness(0);
     setRenderHint(QPainter::Antialiasing);
    // setRubberBand(QChartView::RubberBand::RectangleRubberBand);
@@ -209,6 +218,10 @@ void JFJochDatasetInfoChartView::appendSeries(QLineSeries *s, const std::vector<
 }
 
 void JFJochDatasetInfoChartView::updateChart() {
+    // Room for the outermost labels: a line above the highest Y label, and half a label past the last
+    // X tick on the right. The right margin is in character widths so it holds as the font grows.
+    chart()->setMargins(QMargins(2, 10, 4 * fontMetrics().averageCharWidth(), 2));
+
     // Important: drop any stale QObject pointers BEFORE rebuilding the chart.
     series = nullptr;
     currentSeries = nullptr;
@@ -220,15 +233,56 @@ void JFJochDatasetInfoChartView::updateChart() {
         delete m_hoverLine;
         m_hoverLine = nullptr;
     }
+    if (m_hoverLineHorizontal) {
+        chart()->scene()->removeItem(m_hoverLineHorizontal);
+        delete m_hoverLineHorizontal;
+        m_hoverLineHorizontal = nullptr;
+    }
 
 #ifdef JFJOCH_USE_FFTW
-    if (m_showFFT) {
+    if (m_showFFT)
         buildFFTChart();
-        return;
-    }
+    else
+        buildTimeDomainChart();
+#else
+    buildTimeDomainChart();
 #endif
 
-    buildTimeDomainChart();
+    // Qt Charts elides any axis label that does not fit its allotted box down to "..." (the default
+    // since 6.2). In a dock this narrow that is every label, so show them in full instead.
+    for (auto *axis: chart()->axes())
+        axis->setTruncateLabels(false);
+
+    if (!compact_label_.isEmpty()) {
+        // Half-height plot: minimal margins, the y axis reduced to its two range ends under a
+        // short bold name in the series' colour, and no x labels on the upper plot (the lower
+        // one carries them for both).
+        chart()->setMargins(QMargins(2, 4, 4 * fontMetrics().averageCharWidth(),
+                                     compact_hide_x_ ? 0 : 2));
+        QFont title_font = font();
+        title_font.setBold(true);
+        for (auto *axis: chart()->axes(Qt::Vertical)) {
+            if (auto *v = qobject_cast<QValueAxis *>(axis)) {
+                v->setTickCount(2);
+                v->setLabelFormat("%.3g");
+            }
+            axis->setTitleText(compact_label_);
+            axis->setTitleFont(title_font);
+            if (primary_color_.isValid()) {
+                axis->setTitleBrush(primary_color_);
+                axis->setLabelsColor(primary_color_);
+            }
+        }
+        if (compact_hide_x_)
+            for (auto *axis: chart()->axes(Qt::Horizontal))
+                axis->setLabelsVisible(false);
+    }
+}
+
+void JFJochDatasetInfoChartView::SetCompact(const QString &axis_label, bool hide_x_labels) {
+    compact_label_ = axis_label;
+    compact_hide_x_ = hide_x_labels;
+    setMinimumHeight(compact_label_.isEmpty() ? 140 : 70);
 }
 
 void JFJochDatasetInfoChartView::buildTimeDomainChart() {
@@ -240,6 +294,7 @@ void JFJochDatasetInfoChartView::buildTimeDomainChart() {
             series->setName(primaryName_);
         if (primary_color_.isValid())
             series->setColor(primary_color_);
+        setSeriesPenWidth(series, fontMetrics().height());
         currentSeries = new QScatterSeries(this);
         currentSeries->setColor(Qt::black);     // "current image" marker: fixed, not a run colour
         currentSeries->setMarkerSize(9.0);
@@ -257,6 +312,7 @@ void JFJochDatasetInfoChartView::buildTimeDomainChart() {
             line->setName(ov.name);
             if (ov.color.isValid())
                 line->setColor(ov.color);
+            setSeriesPenWidth(line, fontMetrics().height());
             appendSeries(line, ov.values, ov.x, dispMin, dispMax);
             overlayLines.push_back(line);
         }
@@ -306,7 +362,7 @@ void JFJochDatasetInfoChartView::buildTimeDomainChart() {
         chart()->createDefaultAxes();
 
         // ----- X axis handling -----
-        QValueAxis *axisX = qobject_cast<QValueAxis *>(chart()->axisX(series));
+        QValueAxis *axisX = qobject_cast<QValueAxis *>(chart()->axes(Qt::Horizontal, series).value(0));
         if (axisX) {
             // Always span the whole dataset so a subset run shows at its real position, not stretched.
             if (full_range_ > 1)
@@ -323,12 +379,14 @@ void JFJochDatasetInfoChartView::buildTimeDomainChart() {
                 series->attachAxis(axisX);
                 currentSeries->attachAxis(axisX);
 
-                // Build a visible category axis on the bottom with goniometer angles
+                // Build a visible category axis on the bottom with goniometer angles. No axis
+                // title: Qt Charts caps the horizontal axis area at a fraction of the chart
+                // height, and in a dock this short the title is elided to nothing at any window
+                // size - the degree sign on every tick carries the unit instead.
                 auto *axXcat = new QCategoryAxis();
                 axXcat->setLabelsPosition(QCategoryAxis::AxisLabelsPositionOnValue);
                 axXcat->setGridLineVisible(false);
                 axXcat->setMinorGridLineVisible(false);
-                axXcat->setTitleText(QStringLiteral("Rotation angle (deg.)"));
 
                 const int tickCountX = std::max(2, axisX->tickCount());
                 const double xmin = axisX->min();
@@ -336,20 +394,51 @@ void JFJochDatasetInfoChartView::buildTimeDomainChart() {
                 const double xstep = (tickCountX > 1) ? (xmax - xmin) / (tickCountX - 1) : 0.0;
                 const int64_t lastIdx = static_cast<int64_t>(values.empty() ? 0 : values.size() - 1);
 
-                for (int i = 0; i < tickCountX; ++i) {
-                    const double xv = (i == tickCountX - 1) ? xmax : (xmin + i * xstep);
-                    // Map tick position to closest image index
-                    int64_t imgIdx = static_cast<int64_t>(std::llround(xv));
-                    if (imgIdx < 0) imgIdx = 0;
-                    if (imgIdx > lastIdx) imgIdx = lastIdx;
-
-                    double angleDeg = 0.0;
-                    if (lastIdx >= 0) {
-                        angleDeg = goniometer_axis->GetAngle_deg(imgIdx);
+                // Ticks snap to round angles - multiples of 90° when the sweep is wide enough,
+                // finer otherwise - instead of whatever angle the evenly-spaced image ticks land
+                // on (a 90-450° sweep used to label 359.80). The angle is affine in the image
+                // index, so each round angle maps back to a fractional index position.
+                QList<QPair<double, QString>> snapped;
+                if (lastIdx > 0) {
+                    const double a0 = goniometer_axis->GetAngle_deg(0);
+                    const double a1 = goniometer_axis->GetAngle_deg(lastIdx);
+                    const double lo = std::min(a0, a1), hi = std::max(a0, a1);
+                    double interval = 0.0;
+                    for (double cand : {90.0, 45.0, 30.0, 15.0, 10.0, 5.0, 2.0, 1.0, 0.5, 0.2, 0.1})
+                        if (hi - lo >= 2.0 * cand) { interval = cand; break; }
+                    if (interval > 0.0) {
+                        const double per_image = (a1 - a0) / static_cast<double>(lastIdx);
+                        for (double ang = std::ceil(lo / interval) * interval;
+                             ang <= hi + interval * 1e-6; ang += interval) {
+                            const double xv = (ang - a0) / per_image;
+                            if (xv < xmin || xv > xmax)
+                                continue;
+                            snapped.append({xv, QString("%1°").arg(QString::number(ang, 'f', interval < 1.0 ? 1 : 0))});
+                        }
+                        std::sort(snapped.begin(), snapped.end(),
+                                  [](const auto &l, const auto &r) { return l.first < r.first; });
                     }
+                }
 
-                    QString lab = QString::number(angleDeg, 'f', 2);
-                    axXcat->append(lab, xv);
+                if (snapped.size() >= 2) {
+                    for (const auto &t : snapped)
+                        axXcat->append(t.second, t.first);
+                } else {
+                    for (int i = 0; i < tickCountX; ++i) {
+                        const double xv = (i == tickCountX - 1) ? xmax : (xmin + i * xstep);
+                        // Map tick position to closest image index
+                        int64_t imgIdx = static_cast<int64_t>(std::llround(xv));
+                        if (imgIdx < 0) imgIdx = 0;
+                        if (imgIdx > lastIdx) imgIdx = lastIdx;
+
+                        double angleDeg = 0.0;
+                        if (lastIdx >= 0) {
+                            angleDeg = goniometer_axis->GetAngle_deg(imgIdx);
+                        }
+
+                        QString lab = QString("%1°").arg(QString::number(angleDeg, 'f', 2));
+                        axXcat->append(lab, xv);
+                    }
                 }
 
                 chart()->addAxis(axXcat, Qt::AlignBottom);
@@ -362,7 +451,7 @@ void JFJochDatasetInfoChartView::buildTimeDomainChart() {
         }
 
         // ----- Y-axis handling -----
-        QValueAxis *axisY = qobject_cast<QValueAxis *>(chart()->axisY(series));
+        QValueAxis *axisY = qobject_cast<QValueAxis *>(chart()->axes(Qt::Vertical, series).value(0));
         if (axisY) {
             if (std::isfinite(dispMin) && std::isfinite(dispMax)) {
                 if (m_minYZeroEnabled) {
@@ -388,11 +477,12 @@ void JFJochDatasetInfoChartView::buildTimeDomainChart() {
                 currentSeries->attachAxis(axisY);
 
                 // Build a mirrored visible axis with labels in d (Å) on the LEFT
+                // No "d (Å)" axis title: every label already carries the unit, and no other plot
+                // titles its y axis.
                 auto *axYcat = new QCategoryAxis();
                 axYcat->setLabelsPosition(QCategoryAxis::AxisLabelsPositionOnValue);
                 axYcat->setGridLineVisible(false);
                 axYcat->setMinorGridLineVisible(false);
-                axYcat->setTitleText(QStringLiteral("d (Å)"));
 
                 const int tickCountY = std::max(2, axisY->tickCount());
                 const double ymin = axisY->min();
@@ -442,9 +532,11 @@ void JFJochDatasetInfoChartView::buildTimeDomainChart() {
             for (auto *ax: finalAxes)
                 line->attachAxis(ax);
         }
+
         // The current-image marker is not a run - keep it out of the legend.
         for (auto *marker: chart()->legend()->markers(currentSeries))
             marker->setVisible(false);
+        // Only overlay runs get a legend.
         chart()->legend()->setVisible(!overlays_.empty());
         chart()->legend()->setAlignment(Qt::AlignBottom);
     }
@@ -457,6 +549,12 @@ void JFJochDatasetInfoChartView::setBinning(int64_t val) {
     }
 }
 
+void JFJochDatasetInfoChartView::changeEvent(QEvent *event) {
+    QChartView::changeEvent(event);
+    if (event->type() == QEvent::FontChange)
+        updateChart();   // axis room and the curve's pen are both taken from the font
+}
+
 void JFJochDatasetInfoChartView::contextMenuEvent(QContextMenuEvent *event) {
     QMenu menu(this);
     QAction *copyXY = menu.addAction("Copy (x y) points");
@@ -564,18 +662,25 @@ void JFJochDatasetInfoChartView::mouseMoveEvent(QMouseEvent *event) {
         const double fBin = m_fftFrequenciesHz[static_cast<size_t>(bestIdx)];
         const double amp = m_fftMagnitudes[static_cast<size_t>(bestIdx)];
 
-        // Map x position of that bin to scene coords for vertical line
+        // Map the bin's (frequency, amplitude) to scene coords for the crosshair.
         const QRectF plotArea = chart()->plotArea();
-        const QPointF ptOnChart = chart()->mapToPosition(QPointF(fBin, 0.0), series);
+        const QPointF ptOnChart = chart()->mapToPosition(QPointF(fBin, amp), series);
 
         if (!m_hoverLine) {
             m_hoverLine = new QGraphicsLineItem;
             m_hoverLine->setPen(QPen(QColor(200, 0, 0, 150), 1.0));
             chart()->scene()->addItem(m_hoverLine);
         }
+        if (!m_hoverLineHorizontal) {
+            m_hoverLineHorizontal = new QGraphicsLineItem;
+            m_hoverLineHorizontal->setPen(QPen(QColor(200, 0, 0, 150), 1.0));
+            chart()->scene()->addItem(m_hoverLineHorizontal);
+        }
 
         m_hoverLine->setLine(QLineF(ptOnChart.x(), plotArea.top(),
                                     ptOnChart.x(), plotArea.bottom()));
+        m_hoverLineHorizontal->setLine(QLineF(plotArea.left(), ptOnChart.y(),
+                                              plotArea.right(), ptOnChart.y()));
 
         QString text = QString("f = %1 Hz, amplitude = %2")
                 .arg(fBin, 0, 'g', 6)
@@ -665,6 +770,24 @@ void JFJochDatasetInfoChartView::mouseMoveEvent(QMouseEvent *event) {
     m_hoverLine->setLine(QLineF(ptOnChart.x(), plotArea.top(),
                                 ptOnChart.x(), plotArea.bottom()));
 
+    // Horizontal crosshair at the hovered value, so a run of hovers reads off as a level (flat) or a
+    // drift (rising/falling) at a glance, not just point-by-point in the status bar.
+    if (std::isfinite(yv)) {
+        const QPointF ptOnChartY =
+            chart()->mapToPosition(QPointF(static_cast<double>(idx), yv), series);
+        if (!m_hoverLineHorizontal) {
+            m_hoverLineHorizontal = new QGraphicsLineItem;
+            m_hoverLineHorizontal->setPen(QPen(QColor(200, 0, 0, 150), 1.0));
+            chart()->scene()->addItem(m_hoverLineHorizontal);
+        }
+        m_hoverLineHorizontal->setLine(QLineF(plotArea.left(), ptOnChartY.y(),
+                                              plotArea.right(), ptOnChartY.y()));
+    } else if (m_hoverLineHorizontal) {
+        chart()->scene()->removeItem(m_hoverLineHorizontal);
+        delete m_hoverLineHorizontal;
+        m_hoverLineHorizontal = nullptr;
+    }
+
     // Status bar text based on yv (bin mean in binned mode)
     QString text;
     if (m_yOneOverD) {
@@ -711,6 +834,11 @@ void JFJochDatasetInfoChartView::leaveEvent(QEvent *event) {
         delete m_hoverLine;
         m_hoverLine = nullptr;
     }
+    if (m_hoverLineHorizontal) {
+        chart()->scene()->removeItem(m_hoverLineHorizontal);
+        delete m_hoverLineHorizontal;
+        m_hoverLineHorizontal = nullptr;
+    }
     m_hoverLoadTimer->stop();
     m_hoverPendingIdx = -1;
     emit writeStatusBar(QString(), 0);
@@ -796,8 +924,8 @@ void JFJochDatasetInfoChartView::buildFFTChart() {
     chart()->addSeries(series);
     chart()->createDefaultAxes();
 
-    QValueAxis *axisX = qobject_cast<QValueAxis *>(chart()->axisX(series));
-    QValueAxis *axisY = qobject_cast<QValueAxis *>(chart()->axisY(series));
+    QValueAxis *axisX = qobject_cast<QValueAxis *>(chart()->axes(Qt::Horizontal, series).value(0));
+    QValueAxis *axisY = qobject_cast<QValueAxis *>(chart()->axes(Qt::Vertical, series).value(0));
 
     if (axisX) {
         axisX->setTitleText(QStringLiteral("Frequency (Hz)"));
diff --git a/viewer/charts/JFJochDatasetInfoChartView.h b/viewer/charts/JFJochDatasetInfoChartView.h
index 98352e66f..c1a269951 100644
--- a/viewer/charts/JFJochDatasetInfoChartView.h
+++ b/viewer/charts/JFJochDatasetInfoChartView.h
@@ -25,7 +25,8 @@ class JFJochDatasetInfoChartView : public QChartView {
 
     QPointer<QLineSeries> series = nullptr;
     QPointer<QScatterSeries> currentSeries = nullptr;
-    QGraphicsLineItem *m_hoverLine = nullptr;
+    QGraphicsLineItem *m_hoverLine = nullptr;         // vertical crosshair, at the hovered x
+    QGraphicsLineItem *m_hoverLineHorizontal = nullptr;   // horizontal crosshair, at the hovered y
     QTimer *m_hoverLoadTimer = nullptr;
     int64_t m_hoverPendingIdx = -1;
 
@@ -37,6 +38,11 @@ class JFJochDatasetInfoChartView : public QChartView {
     bool m_minYZeroEnabled = true;
     bool m_yOneOverD = false;
     bool m_xUseGoniometerAxis = true;
+    // Compact mode: this view is one of two stacked half-height plots. The y axis is reduced to
+    // its two range ends, named by a short bold coloured label; the upper plot hides its x labels
+    // (the lower one carries them for both).
+    QString compact_label_;
+    bool compact_hide_x_ = false;
 
     std::optional<GoniometerAxis> goniometer_axis;
     std::optional<float> image_time_us;
@@ -78,6 +84,7 @@ private slots:
     void setBinning(int64_t val);
 
 private:
+    void changeEvent(QEvent *event) override;
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
     void leaveEvent(QEvent *event) override;
@@ -86,6 +93,8 @@ private:
 public:
     explicit JFJochDatasetInfoChartView(QWidget *parent = nullptr);
     void setImage(int64_t val);
+    // An empty label switches compact mode off. Takes effect on the next loadValues().
+    void SetCompact(const QString &axis_label, bool hide_x_labels);
 
 public slots:
     void resetZoom();
diff --git a/viewer/charts/JFJochSimpleChartView.cpp b/viewer/charts/JFJochSimpleChartView.cpp
index d0651a540..6a8ce3e7d 100644
--- a/viewer/charts/JFJochSimpleChartView.cpp
+++ b/viewer/charts/JFJochSimpleChartView.cpp
@@ -170,6 +170,11 @@ void JFJochSimpleChartView::UpdateData(const std::vector<float> &in_x, const std
         chart()->addAxis(axX, Qt::AlignBottom);
         series->attachAxis(axX);
     }
+
+    // Qt Charts elides any axis label that does not fit its allotted box down to "..." (the default
+    // since 6.2). In a dock this narrow that is every label, so show them in full instead.
+    for (auto *axis: chart()->axes())
+        axis->setTruncateLabels(false);
 }
 
 
diff --git a/viewer/image_viewer/JFJochDiffractionImage.cpp b/viewer/image_viewer/JFJochDiffractionImage.cpp
index dfd2e6e84..e1d995dd7 100644
--- a/viewer/image_viewer/JFJochDiffractionImage.cpp
+++ b/viewer/image_viewer/JFJochDiffractionImage.cpp
@@ -20,6 +20,7 @@
 #include <QScrollBar>
 #include <QMenu>
 #include <cmath>
+#include <limits>
 #include <QMouseEvent>
 
 #include "JFJochSimpleImage.h"
@@ -157,6 +158,9 @@ void JFJochDiffractionImage::DrawSpots() {
     // Compute current visible area in scene coordinates
     const QRectF visibleRect = mapToScene(viewport()->geometry()).boundingRect();
 
+    QPen casing_pen(Qt::black, 3 + MARKER_CASING_EXTRA_WIDTH);
+    casing_pen.setCosmetic(true);
+
     for (const auto &s: image->ImageData().spots) {
         // Skip reflections outside the viewport
         if (!visibleRect.contains(QPointF{s.x, s.y}))
@@ -179,12 +183,9 @@ void JFJochDiffractionImage::DrawSpots() {
         QPen pen(pen_color, 3);
         pen.setCosmetic(true);
 
-        auto *rect = scene()->addRect(s.x - spot_size + 0.5,
-                                     s.y - spot_size + 0.5,
-                                     2 * spot_size,
-                                     2 * spot_size,
-                                     pen);
-        addOverlayItem(rect);
+        const QRectF box(s.x - spot_size + 0.5, s.y - spot_size + 0.5, 2 * spot_size, 2 * spot_size);
+        addOverlayItem(scene()->addRect(box, casing_pen));   // added first, so it stays underneath
+        addOverlayItem(scene()->addRect(box, pen));
     }
 }
 
@@ -246,8 +247,10 @@ void JFJochDiffractionImage::DrawResolutionRings() {
     if (ring_mode == RingMode::None)
         return;
 
-    // Get the visible area in the scene coordinates
-    QRectF visibleRect = mapToScene(viewport()->geometry()).boundingRect();
+    // Get the visible area in the scene coordinates (viewport()->rect(), not geometry():
+    // mapToScene takes viewport coordinates, and geometry() is offset by the viewport's
+    // position in its parent).
+    QRectF visibleRect = mapToScene(viewport()->rect()).boundingRect();
 
     int startX = std::max(0, static_cast<int>(std::floor(visibleRect.left())));
     int endX = std::min(static_cast<int>(image->Dataset().experiment.GetXPixelsNum()),
@@ -305,7 +308,7 @@ void JFJochDiffractionImage::DrawResolutionRings() {
     QVector<qreal> dashPattern = {10, 15};
     pen.setDashPattern(dashPattern);
 
-    float phi_offset = 0;
+    int label_stagger = 0;
 
     // Tracing the contours costs 361 geometry evaluations per ring, and they only move when the
     // ring list or the geometry changes - not when the view is panned or zoomed, which is when
@@ -359,39 +362,84 @@ void JFJochDiffractionImage::DrawResolutionRings() {
     for (const auto &[d, path]: ring_cache_) {
         addOverlayItem(scene()->addPath(path, pen));
 
-        // Place the "d Å" label at the first cardinal azimuth (staggered per ring) that is visible.
+        // The "d Å" label is drawn in device coordinates (ItemIgnoresTransformations), so it
+        // keeps a constant on-screen size - the application font, a step up and bold - at every
+        // zoom; shrinking a scene-space font by 1/zoom instead breaks glyph rendering once the
+        // point size drops below one. No outline; the colour is picked from what ends up under
+        // the label, white only over the image of a dark colour map. It is centred on the first
+        // sampled azimuth (staggered per ring) where the whole text fits in the viewport;
+        // failing that, on the visible ring point closest to the viewport centre, clamped
+        // inside - never half a label off the edge.
+        QFont font = this->font();
+        font.setPointSizeF(font.pointSizeF() * 1.6);
+        font.setBold(true);
+
+        auto *textItem = new QGraphicsSimpleTextItem(
+            QString("%1 Å").arg(QString::number(d, 'f', 2)));
+        textItem->setFont(font);
+        textItem->setFlag(QGraphicsItem::ItemIgnoresTransformations);
+        textItem->setPen(Qt::NoPen);   // brush is chosen below, from what ends up under the label
+        // Device-size text: convert to scene units for the placement math below.
+        const qreal sx = std::max(1e-6, transform().m11());
+        const qreal sy = std::max(1e-6, transform().m22());
+        const QSizeF dev = textItem->boundingRect().size();
+        const QSizeF sz(dev.width() / sx, dev.height() / sy);
+
+        QRectF inner = visibleRect.adjusted(sz.height() * 0.3, sz.height() * 0.3,
+                                            -sz.height() * 0.3, -sz.height() * 0.3);
+        if (!inner.isValid())
+            inner = visibleRect;
+
         bool have_label = false;
-        QPointF label_pos;
-        for (float base : {0.0f, static_cast<float>(PI) / 2.0f,
-                           static_cast<float>(PI), 3.0f * static_cast<float>(PI) / 2.0f}) {
-            try {
-                auto [x, y] = geom.ResPhiToPxl(d, phi_offset + base);
-                QPointF p(x, y);
-                if (std::isfinite(x) && std::isfinite(y) && visibleRect.contains(p)) {
-                    label_pos = p;
-                    have_label = true;
-                    break;
-                }
-            } catch (...) {
+        bool fits = false;
+        QPointF label_center;
+        double best_dist = std::numeric_limits<double>::max();
+        // Walk the ring's own traced points (dense enough that a narrow visible arc is never
+        // missed), starting at a per-ring stagger so neighbouring rings label different azimuths.
+        const int n = path.elementCount();
+        for (int k = 0; k < n; k++) {
+            const auto e = path.elementAt((k + label_stagger) % n);
+            const QPointF p(e.x, e.y);
+            if (!visibleRect.contains(p))
+                continue;
+            const QRectF r(p - QPointF(sz.width() / 2, sz.height() / 2), sz);
+            if (inner.contains(r)) {
+                label_center = p;
+                have_label = true;
+                fits = true;
                 break;
             }
+            const double dist = QLineF(p, visibleRect.center()).length();
+            if (dist < best_dist) {
+                best_dist = dist;
+                label_center = p;
+                have_label = true;
+            }
         }
 
         if (have_label) {
-            QFont font("Arial", 16);
-
-            const qreal f = std::clamp(scale_factor, 0.5, 50.0);
-            font.setPointSizeF(16.0 / sqrt(f)); // base 12pt around scale_factor ~10
-
-            auto *textItem = new QGraphicsSimpleTextItem(
-                QString("%1 Å").arg(QString::number(d, 'f', 2)));
-            textItem->setFont(font);
-            textItem->setBrush(ring_color);
-            textItem->setPos(label_pos);
+            QRectF r(label_center - QPointF(sz.width() / 2, sz.height() / 2), sz);
+            if (!fits) {
+                if (r.left() < inner.left()) r.moveLeft(inner.left());
+                if (r.right() > inner.right()) r.moveRight(inner.right());
+                if (r.top() < inner.top()) r.moveTop(inner.top());
+                if (r.bottom() > inner.bottom()) r.moveBottom(inner.bottom());
+            }
+            // The label prints dark unless it lands on the image with a dark colour map: off the
+            // image the canvas is white whatever the map, and on its own magenta dashes either
+            // colour separates where the ring colour would blend.
+            const auto map_zero = color_scale.Apply(0.0f);
+            const double zero_luminance = 0.2126 * map_zero.r + 0.7152 * map_zero.g + 0.0722 * map_zero.b;
+            const bool dark_under = zero_luminance <= 127.0
+                && QRectF(0, 0, static_cast<qreal>(W), static_cast<qreal>(H)).contains(r.center());
+            textItem->setBrush(dark_under ? QColor(Qt::white) : QColor(0x20, 0x20, 0x20));
+            textItem->setPos(r.topLeft());
             scene()->addItem(textItem);
             addOverlayItem(textItem);
+        } else {
+            delete textItem;
         }
-        phi_offset += 4.0 / 180.0 * PI;
+        label_stagger += 29;
     }
 }
 
@@ -840,6 +888,9 @@ void JFJochDiffractionImage::roiScratchDrawn() {
 }
 
 void JFJochDiffractionImage::keyPressEvent(QKeyEvent *event) {
+    // Home/End/PageUp/PageDown dataset navigation lives in the main window's application-wide
+    // event filter, so it works with any panel focused - this handler never sees those keys.
+
     if (event->key() == Qt::Key_Delete && image && !selected_roi_.isEmpty()) {
         ROIDefinition rois = image->Dataset().experiment.ROI().GetROIDefinition();
         const std::string sel = selected_roi_.toStdString();
@@ -859,16 +910,22 @@ void JFJochDiffractionImage::keyPressEvent(QKeyEvent *event) {
 }
 
 
+std::optional<float> JFJochDiffractionImage::AutoForegroundValue() const {
+    if (!image)
+        return {};
+    if (!hdr_mode)
+        return static_cast<float>(image->GetAutoContrastValue());
+    const auto val_range = image->ValidMinMax();
+    if (!val_range.has_value())
+        return {};
+    return static_cast<float>(val_range->second);
+}
+
 void JFJochDiffractionImage::UpdateForeground() {
     if (!image || !auto_fg)
         return;
-    if (hdr_mode) {
-        const auto val_range = image->ValidMinMax();
-        if (val_range.has_value())
-            foreground = val_range->second;
-    } else {
-        foreground = image->GetAutoContrastValue();
-    }
+    if (const auto val = AutoForegroundValue())
+        foreground = *val;
     emit foregroundChanged(foreground);
 }
 
@@ -882,6 +939,7 @@ void JFJochDiffractionImage::setHDRMode(bool input) {
 void JFJochDiffractionImage::loadImage(std::shared_ptr<const JFJochReaderImage> in_image) {
     live_pending_ = false;   // a live ROI edit (if any) has now been recomputed
     ring_cache_key_.clear();   // geometry may differ, re-trace the resolution rings
+    one_shot_auto_ = false;    // a new image has its own auto value: `A` is a one-shot again
     if (in_image) {
         image = in_image;
         UpdateForeground();
@@ -902,6 +960,7 @@ void JFJochDiffractionImage::loadImage(std::shared_ptr<const JFJochReaderImage>
 
 void JFJochDiffractionImage::setAutoForeground(bool input) {
     auto_fg = input;
+    one_shot_auto_ = false;   // whatever `A` did before, the next press starts as a one-shot again
     // If auto_foreground is not set, then view stays with the current settings till these are explicitly changed
     UpdateForeground();
     RenderImage();
@@ -909,6 +968,25 @@ void JFJochDiffractionImage::setAutoForeground(bool input) {
     emit autoForegroundChanged(auto_fg);
 }
 
+void JFJochDiffractionImage::oneShotAutoForeground() {
+    if (auto_fg)
+        return;   // Auto already follows every image: there is nothing to apply, and nothing to undo
+
+    if (one_shot_auto_) {
+        setAutoForeground(true);   // second press on the same image: keep it on from now on
+        return;
+    }
+
+    const auto val = AutoForegroundValue();
+    if (!val)
+        return;
+    // Unlike a manual foreground change this leaves auto_fg alone (it is off here either way).
+    foreground = *val;
+    one_shot_auto_ = true;
+    ScheduleRenderImage();
+    emit foregroundChanged(foreground);
+}
+
 void JFJochDiffractionImage::setResolutionRing(QVector<float> v) {
     res_ring = v;
     ring_mode = RingMode::Manual;
diff --git a/viewer/image_viewer/JFJochDiffractionImage.h b/viewer/image_viewer/JFJochDiffractionImage.h
index 24e2dd1c1..3790ca5e7 100644
--- a/viewer/image_viewer/JFJochDiffractionImage.h
+++ b/viewer/image_viewer/JFJochDiffractionImage.h
@@ -19,6 +19,14 @@ Q_OBJECT
     QColor prediction_color = Qt::darkRed;
     QColor ice_ring_color = Qt::cyan;
     QColor second_lattice_color = QColor(0xFA, 0x72, 0x68);   // coral, the viewer "finishing" accent
+    // Spot markers are drawn twice: a black pen this much wider underneath, then the marker on
+    // top. The hues mean something - cyan is the colour of ice, magenta is the one colour no
+    // colour map contains - so none of them moves to gain contrast. The casing carries the
+    // marker where the colour map's low end is light, the bright core carries it where it is
+    // dark, so one mechanism covers both without branching on the colour map. Predictions are
+    // left alone: darkRed is already legible on a light map and a black casing does nothing for
+    // it on a dark one.
+    static constexpr int MARKER_CASING_EXTRA_WIDTH = 4;
 
     float hover_resolution = NAN;
     // The "d = ... A" readout is painted in drawForeground() in viewport pixels rather than kept
@@ -91,6 +99,10 @@ private:
     void DrawCross(float x, float y, float size, float width, float z = 1);
 
     void UpdateForeground();
+    // The foreground the current image suggests: the top of the valid range in HDR mode, the
+    // auto-contrast value otherwise. Empty when there is no image to take it from.
+    [[nodiscard]] std::optional<float> AutoForegroundValue() const;
+    bool one_shot_auto_ = false;   // `A` applied the auto value; pressing it again makes Auto permanent
     void leaveEvent(QEvent *event) override;
 
     std::shared_ptr<const JFJochReaderImage> image;
@@ -125,6 +137,9 @@ public slots:
     void setSelectedROI(QString name);
     void loadImage(std::shared_ptr<const JFJochReaderImage> image);
     void setAutoForeground(bool input);
+    // Apply the auto-contrast value once, leaving Auto as it was; pressing it a second time on the
+    // same image switches Auto on for good (which keeps recomputing it on every subsequent image).
+    void oneShotAutoForeground();
     void setResolutionRing(QVector<float> v);
     void setResolutionRingMode(RingMode mode);
 
diff --git a/viewer/image_viewer/JFJochImage.cpp b/viewer/image_viewer/JFJochImage.cpp
index 72941a010..d58b6887d 100644
--- a/viewer/image_viewer/JFJochImage.cpp
+++ b/viewer/image_viewer/JFJochImage.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include "JFJochImage.h"
+#include "../RemoteDisplayMode.h"
 
 #include <QGraphicsSimpleTextItem>
 #include <QScrollBar>
@@ -65,6 +66,18 @@ JFJochImage::JFJochImage(QWidget *parent) : QGraphicsView(parent) {
     hover_tail_timer_ = new QTimer(this);
     hover_tail_timer_->setSingleShot(true);
     connect(hover_tail_timer_, &QTimer::timeout, this, &JFJochImage::UpdateHover);
+
+    pan_tail_timer_ = new QTimer(this);
+    pan_tail_timer_->setSingleShot(true);
+    connect(pan_tail_timer_, &QTimer::timeout, this, &JFJochImage::ApplyPendingPan);
+
+    zoom_tail_timer_ = new QTimer(this);
+    zoom_tail_timer_->setSingleShot(true);
+    connect(zoom_tail_timer_, &QTimer::timeout, this, &JFJochImage::ApplyPendingZoom);
+
+    render_tail_timer_ = new QTimer(this);
+    render_tail_timer_->setSingleShot(true);
+    connect(render_tail_timer_, &QTimer::timeout, this, &JFJochImage::ScheduleRenderImage);
 }
 
 void JFJochImage::onScroll(int value) {
@@ -103,9 +116,17 @@ void JFJochImage::leaveEvent(QEvent *event) {
 void JFJochImage::ScheduleRenderImage() {
     if (render_pending_)
         return;
+    // Remotely a recolour repaint is a full-window upload, so a wheel or slider burst is
+    // recoloured at the hover cadence; the tail run picks up the final value.
+    if (RemoteDisplayMode() && render_rate_.isValid() && render_rate_.elapsed() < kHoverIntervalMs) {
+        render_tail_timer_->start(kHoverIntervalMs);
+        return;
+    }
+    render_tail_timer_->stop();
     render_pending_ = true;
     QTimer::singleShot(0, this, [this] {
         render_pending_ = false;
+        render_rate_.restart();
         RenderImage();
         Redraw();
     });
@@ -143,16 +164,6 @@ void JFJochImage::setFeatureColor(QColor input) {
 void JFJochImage::wheelEvent(QWheelEvent *event) {
     if (!scene()) return;
 
-    // Alt+wheel steps through the dataset instead of zooming. The view does not know which image
-    // it shows, so the step is emitted and the navigation toolbar applies it.
-    if (event->modifiers() & Qt::AltModifier) {
-        const int delta = event->angleDelta().y();
-        if (delta != 0)
-            emit stepImage(delta > 0 ? 1 : -1);
-        event->accept();
-        return;
-    }
-
     const double zoomFactor = 1.15; // Zoom factor
 
     // Get the position of the mouse in scene coordinates
@@ -161,7 +172,13 @@ void JFJochImage::wheelEvent(QWheelEvent *event) {
     const bool exp_fg_adjust = (event->modifiers() & Qt::ControlModifier);
     const bool lin_fg_adjust = (event->modifiers() & Qt::ShiftModifier) || m_adjustForegroundWithWheel;
 
-    if (exp_fg_adjust || lin_fg_adjust) {
+    if (m_adjustBackgroundWithWheel) {
+        // Held B: the wheel moves the black point, clamped so a positive display range remains.
+        float new_background = background + event->angleDelta().y() / 120.0f;
+        new_background = std::clamp(new_background, 0.0f, std::max(0.0f, foreground - 1.0f));
+        changeBackground(new_background);
+        emit backgroundChanged(background);
+    } else if (exp_fg_adjust || lin_fg_adjust) {
         float new_foreground = foreground;
 
         if (exp_fg_adjust) {
@@ -171,41 +188,64 @@ void JFJochImage::wheelEvent(QWheelEvent *event) {
             new_foreground = foreground + event->angleDelta().y() / 120.0f;
         }
 
-        if (new_foreground < 1.0f)
-            new_foreground = 1.0f;
+        // Keep the white point above the black point (1.0 when the background sits at zero).
+        if (new_foreground < background + 1.0f)
+            new_foreground = background + 1.0f;
 
         changeForeground(new_foreground);
         emit foregroundChanged(foreground);
     } else {
-        // Zooming and re-centering both move the scrollbars, and every move reaches
-        // onScroll(); suppress those and rebuild the overlay once, below.
-        suppress_overlay_update_ = true;
-
-        // Perform zooming
-        if (event->angleDelta().y() > 0) {
-            if (scale_factor * zoomFactor < 500.0) {
-                scale_factor *= zoomFactor;
-                scale(zoomFactor, zoomFactor);
-            }
+        pending_zoom_steps_ += (event->angleDelta().y() > 0) ? 1 : -1;
+        zoom_anchor_vp_ = event->position().toPoint();
+        if (RemoteDisplayMode() && zoom_rate_.isValid() && zoom_rate_.elapsed() < kHoverIntervalMs) {
+            zoom_tail_timer_->start(kHoverIntervalMs);
         } else {
-            if (scale_factor > 0.2) {
-                scale_factor *= 1.0 / zoomFactor;
-                scale(1.0 / zoomFactor, 1.0 / zoomFactor);
-            }
+            zoom_tail_timer_->stop();
+            ApplyPendingZoom();
         }
-
-        // Adjust the view's center to keep the zoom focused on the mouse position
-        QPointF updatedViewportCenter = mapToScene(viewport()->rect().center());
-        QPointF delta = targetScenePos - updatedViewportCenter;
-        translate(delta.x(), delta.y()); // Shift the view
-
-        suppress_overlay_update_ = false;
-
-        updateOverlay();
-        emitViewportChanged();
     }
 }
 
+void JFJochImage::ApplyPendingZoom() {
+    zoom_rate_.restart();
+    int steps = pending_zoom_steps_;
+    pending_zoom_steps_ = 0;
+    if (steps == 0 || !scene())
+        return;
+
+    const double zoomFactor = 1.15;
+
+    // Keep the zoom focused on the (last) mouse position
+    const QPointF targetScenePos = mapToScene(zoom_anchor_vp_);
+
+    // Zooming and re-centering both move the scrollbars, and every move reaches
+    // onScroll(); suppress those and rebuild the overlay once, below.
+    suppress_overlay_update_ = true;
+
+    for (; steps > 0; --steps) {
+        if (scale_factor * zoomFactor < 500.0) {
+            scale_factor *= zoomFactor;
+            scale(zoomFactor, zoomFactor);
+        }
+    }
+    for (; steps < 0; ++steps) {
+        if (scale_factor > 0.2) {
+            scale_factor *= 1.0 / zoomFactor;
+            scale(1.0 / zoomFactor, 1.0 / zoomFactor);
+        }
+    }
+
+    // Adjust the view's center to keep the zoom focused on the mouse position
+    QPointF updatedViewportCenter = mapToScene(viewport()->rect().center());
+    QPointF delta = targetScenePos - updatedViewportCenter;
+    translate(delta.x(), delta.y()); // Shift the view
+
+    suppress_overlay_update_ = false;
+
+    updateOverlay();
+    emitViewportChanged();
+}
+
 void JFJochImage::resizeEvent(QResizeEvent *event) {
     QGraphicsView::resizeEvent(event);
 
@@ -295,18 +335,15 @@ void JFJochImage::mouseMoveEvent(QMouseEvent *event) {
             roiEditMove(scenePos);
             return;
         case MouseEventType::Panning: {
-            const QPoint viewDelta = event->pos() - lastMousePos;
+            pending_pan_ += event->pos() - lastMousePos;
             lastMousePos = event->pos();
 
-            // Each setValue() reaches onScroll(), so the overlay was rebuilt three times per
-            // mouse move. Suppress those and rebuild once, below.
-            suppress_overlay_update_ = true;
-            horizontalScrollBar()->setValue(horizontalScrollBar()->value() - viewDelta.x());
-            verticalScrollBar()->setValue(verticalScrollBar()->value() - viewDelta.y());
-            suppress_overlay_update_ = false;
-
-            updateOverlay();
-            emitViewportChanged();
+            if (RemoteDisplayMode() && pan_rate_.isValid() && pan_rate_.elapsed() < kHoverIntervalMs) {
+                pan_tail_timer_->start(kHoverIntervalMs);
+                break;
+            }
+            pan_tail_timer_->stop();
+            ApplyPendingPan();
             break;
         }
         case MouseEventType::DrawingROI:
@@ -387,10 +424,32 @@ void JFJochImage::mouseMoveEvent(QMouseEvent *event) {
     QGraphicsView::mouseMoveEvent(event);
 }
 
+void JFJochImage::ApplyPendingPan() {
+    pan_rate_.restart();
+    if (pending_pan_.isNull())
+        return;
+
+    // Each setValue() reaches onScroll(), so the overlay was rebuilt three times per
+    // mouse move. Suppress those and rebuild once, below.
+    suppress_overlay_update_ = true;
+    horizontalScrollBar()->setValue(horizontalScrollBar()->value() - pending_pan_.x());
+    verticalScrollBar()->setValue(verticalScrollBar()->value() - pending_pan_.y());
+    suppress_overlay_update_ = false;
+    pending_pan_ = QPoint();
+
+    updateOverlay();
+    emitViewportChanged();
+}
+
 void JFJochImage::mouseReleaseEvent(QMouseEvent *event) {
     if (!scene()) return;
 
     if (event->button() == Qt::LeftButton) {
+        if (mouse_event_type == MouseEventType::Panning) {
+            // Land the view exactly where the drag ended, even if the last motions were skipped
+            pan_tail_timer_->stop();
+            ApplyPendingPan();
+        }
         if (mouse_event_type == MouseEventType::EditingExternalROI) {
             roiEditRelease();
         } else {
@@ -994,6 +1053,10 @@ void JFJochImage::adjustForeground(bool input) {
     m_adjustForegroundWithWheel = input;
 }
 
+void JFJochImage::adjustBackground(bool input) {
+    m_adjustBackgroundWithWheel = input;
+}
+
 double JFJochImage::GetScaleFactor() const {
     return scale_factor;
 }
diff --git a/viewer/image_viewer/JFJochImage.h b/viewer/image_viewer/JFJochImage.h
index afeb7a92c..73349a979 100644
--- a/viewer/image_viewer/JFJochImage.h
+++ b/viewer/image_viewer/JFJochImage.h
@@ -73,6 +73,7 @@ class JFJochImage : public QGraphicsView {
     Q_OBJECT
 
     bool m_adjustForegroundWithWheel = false;
+    bool m_adjustBackgroundWithWheel = false;
 
     // Viewport-lock support: guard prevents the emit<->apply ping-pong between
     // two linked views, and the helper broadcasts the current transform+center.
@@ -192,6 +193,23 @@ protected:
     QElapsedTimer hover_rate_;
     QTimer *hover_tail_timer_ = nullptr;
 
+    // Panning and wheel zooming repaint once per input event, which is fine locally and hopeless
+    // on a remote display (see ScheduleHoverUpdate above - same reasoning, same cadence, same
+    // inline-plus-tail shape). On a remote session the skipped events only accumulate - a pan its
+    // pixel delta, a zoom its wheel steps - and the accumulated gesture is applied whole, so the
+    // view ends exactly where the same gesture would have put it unthrottled. Locally every event
+    // is still applied inline and nothing changes.
+    void ApplyPendingPan();
+    QPoint pending_pan_;
+    QElapsedTimer pan_rate_;
+    QTimer *pan_tail_timer_ = nullptr;
+
+    void ApplyPendingZoom();
+    int pending_zoom_steps_ = 0;
+    QPoint zoom_anchor_vp_;
+    QElapsedTimer zoom_rate_;
+    QTimer *zoom_tail_timer_ = nullptr;
+
     ResizeHandle hitTestROIHandle(const QPointF& scenePos, qreal tol = 3.0) const;
 
     void updateOverlay();
@@ -203,9 +221,12 @@ protected:
     virtual void ColorRow(size_t y, const PixelColorMap &map, QRgb *out) const;
     // Re-render once the event queue drains. The foreground slider and the wheel emit far
     // faster than a large image can be recoloured, so intermediate values are dropped
-    // instead of queueing a full recolour per event.
+    // instead of queueing a full recolour per event. On a remote display the drain still
+    // repaints once per event, so there the recolour is additionally held to the hover cadence.
     void ScheduleRenderImage();
     bool render_pending_ = false;
+    QElapsedTimer render_rate_;
+    QTimer *render_tail_timer_ = nullptr;
     bool image_dirty_ = false;   // frame_ changed since the item was last refreshed
     void ClearFrame();           // drop the pixels and tell followers
     // Set while a pan/zoom moves the scrollbars, so onScroll() does not rebuild the overlay
@@ -237,7 +258,8 @@ signals:
     void hoverScenePos(QPointF scenePos);
     // A new frame has been rendered into Frame(). Follower views repaint on this.
     void frameRendered();
-    // Alt+wheel asks for a move through the dataset: +1 one image forward, -1 one back.
+    // Asks for a move through the dataset (e.g. Home/End/PageUp/PageDown in a subclass'
+    // keyPressEvent): the navigation toolbar applies the step, clamped to the dataset's range.
     void stepImage(int steps);
 private slots:
     void onScroll(int value);
@@ -255,6 +277,7 @@ public slots:
     void fitToView();
 
     void adjustForeground(bool input);
+    void adjustBackground(bool input);
     void setZoom(double input);
 public:
     explicit JFJochImage(QWidget *parent = nullptr);
diff --git a/viewer/jfjoch_viewer.cpp b/viewer/jfjoch_viewer.cpp
index bdaae45b3..a0f75c4dd 100644
--- a/viewer/jfjoch_viewer.cpp
+++ b/viewer/jfjoch_viewer.cpp
@@ -4,11 +4,59 @@
 #include <QSplashScreen>
 #include <QTimer>
 #include <QPalette>
+#include <QProxyStyle>
+#include <QStyleOption>
+#include <QPainter>
 
 #include "JFJochViewerWindow.h"
+#include "RemoteDisplayMode.h"
 #include "../writer/HDF5Objects.h"
 #include "../common/GitInfo.h"
 
+namespace {
+
+// Fusion paints the dock resize handles in the window colour, which leaves them invisible against
+// the salmon background (1.00:1) and impossible to find; a full-length coral band fixed that but
+// dominated the view. So the separator keeps its 10 px grab area, is painted in the window colour,
+// and is marked only by a short dark-amber pill (4.4:1 on salmon) at its midpoint, which takes the
+// brand coral under the cursor.
+class SeparatorHandleStyle final : public QProxyStyle {
+public:
+    explicit SeparatorHandleStyle(const QString &base) : QProxyStyle(base) {}
+
+    int pixelMetric(PixelMetric m, const QStyleOption *opt, const QWidget *w) const override {
+        if (m == PM_DockWidgetSeparatorExtent)
+            return 10;
+        return QProxyStyle::pixelMetric(m, opt, w);
+    }
+
+    void drawPrimitive(PrimitiveElement el, const QStyleOption *opt, QPainter *p,
+                       const QWidget *w) const override {
+        if (el != PE_IndicatorDockWidgetResizeHandle) {
+            QProxyStyle::drawPrimitive(el, opt, p, w);
+            return;
+        }
+        p->fillRect(opt->rect, opt->palette.window());
+        const bool vertical = opt->rect.width() < opt->rect.height();
+        const QColor pill_color = (opt->state & State_MouseOver) ? QColor(0xFA, 0x72, 0x68)
+                                                                 : QColor(0xB4, 0x53, 0x09);
+        constexpr qreal kLen = 56.0, kThick = 5.0;
+        const QPointF c = QRectF(opt->rect).center();
+        const QRectF pill = vertical ? QRectF(c.x() - kThick / 2, c.y() - kLen / 2, kThick, kLen)
+                                     : QRectF(c.x() - kLen / 2, c.y() - kThick / 2, kLen, kThick);
+        p->save();
+        p->setRenderHint(QPainter::Antialiasing);
+        // Cased in a near-white rim, like the spot markers: the bright seam lifts the grip off
+        // the salmon band instead of letting the amber bleed into it.
+        p->setPen(QPen(QColor(0xFF, 0xFC, 0xFA), 1));
+        p->setBrush(pill_color);
+        p->drawRoundedRect(pill, kThick / 2, kThick / 2);
+        p->restore();
+    }
+};
+
+} // namespace
+
 int main(int argc, char *argv[]) {
 
     qRegisterMetaType<std::shared_ptr<const JFJochReaderDataset>>("std::shared_ptr<const JFJochReaderDataset>");
@@ -19,7 +67,7 @@ int main(int argc, char *argv[]) {
 
     // Theme via the palette (robust across widgets): salmon panels, white entry fields that fall back
     // to salmon when disabled, and a navy accent for selections and progress-bar chunks.
-    app.setStyle("Fusion");
+    app.setStyle(new SeparatorHandleStyle("Fusion"));
     QPalette pal = app.palette();
     pal.setColor(QPalette::Window, QColor(255, 235, 230));
     pal.setColor(QPalette::Base, Qt::white);
@@ -31,6 +79,7 @@ int main(int argc, char *argv[]) {
     app.setPalette(pal);
     // Fusion fills QGroupBox interiors with a flat light colour; make them transparent so they show
     // the salmon window background like the rest of the UI (entry widgets stay white via the palette).
+    // The dock resize handles are drawn by SeparatorHandleStyle above, not the stylesheet.
     app.setStyleSheet("QGroupBox { background-color: transparent; }");
 
     QIcon appIcon(":/jfjoch.png");
@@ -54,6 +103,10 @@ int main(int argc, char *argv[]) {
     // Process the actual command line arguments
     parser.process(app);
 
+    if (RemoteDisplayMode())
+        qInfo() << "Remote display session detected - repaints are throttled"
+                   " (JFJOCH_VIEWER_REMOTE=0 or the View menu to override)";
+
     // Get any positional arguments (files to open)
     QString fileToOpen;
     QStringList positionalArgs = parser.positionalArguments();
diff --git a/viewer/toolbar/JFJochViewerToolbarDisplay.cpp b/viewer/toolbar/JFJochViewerToolbarDisplay.cpp
index 7048192ad..d9fac3972 100644
--- a/viewer/toolbar/JFJochViewerToolbarDisplay.cpp
+++ b/viewer/toolbar/JFJochViewerToolbarDisplay.cpp
@@ -4,6 +4,7 @@
 #include "JFJochViewerToolbarDisplay.h"
 #include <QLabel>
 #include "../../common/ColorScale.h"
+#include "../RemoteDisplayMode.h"
 #include "../widgets/ToolbarIcons.h"
 
 constexpr double MAX_SLIDER_NO_IMAGE = 65000;
@@ -11,19 +12,47 @@ constexpr double MAX_SLIDER_NO_IMAGE = 65000;
 JFJochViewerToolbarDisplay::JFJochViewerToolbarDisplay(QWidget *parent)
     : QToolBar(parent) {
     setWindowTitle("Display");   // shown in the toolbar/dock context menu
+
+    foreground_tail_timer_ = new QTimer(this);
+    foreground_tail_timer_->setSingleShot(true);
+    connect(foreground_tail_timer_, &QTimer::timeout,
+            this, &JFJochViewerToolbarDisplay::ApplyPendingForeground);
+
+    background_tail_timer_ = new QTimer(this);
+    background_tail_timer_->setSingleShot(true);
+    connect(background_tail_timer_, &QTimer::timeout,
+            this, &JFJochViewerToolbarDisplay::ApplyPendingBackground);
+
+    const QString sliderStyle =
+        "QSlider::groove:horizontal { height:6px; background:#F3D9D4; border-radius:3px; }"
+        "QSlider::sub-page:horizontal { background:#FA7268; border-radius:3px; }"
+        "QSlider::handle:horizontal { background:#1F3A5F; width:14px; margin:-5px 0; border-radius:7px; }"
+        "QSlider::handle:horizontal:hover { background:#16314F; }";
+    // Two sliders share the strip, so each is capped rather than expanding across the window.
+    const int slider_cap = fontMetrics().averageCharWidth() * 36;
+
     addWidget(new QLabel(" Foreground  ", this));
 
     foreground_slider = new SliderPlusBox(1, MAX_SLIDER_NO_IMAGE, 1.0, 1, this,
                                           SliderPlusBox::ScaleType::Logarithmic);
     foreground_slider->setValue(10);
-    foreground_slider->setToolTip("White point of the colour map (image contrast)");
-    foreground_slider->setStyleSheet(
-        "QSlider::groove:horizontal { height:6px; background:#F3D9D4; border-radius:3px; }"
-        "QSlider::sub-page:horizontal { background:#FA7268; border-radius:3px; }"
-        "QSlider::handle:horizontal { background:#1F3A5F; width:14px; margin:-5px 0; border-radius:7px; }"
-        "QSlider::handle:horizontal:hover { background:#16314F; }");
+    foreground_slider->setToolTip("White point of the color map (image contrast); hold F and use"
+                                  " the mouse wheel, Ctrl+wheel for coarse steps");
+    foreground_slider->setStyleSheet(sliderStyle);
+    foreground_slider->setMaximumWidth(slider_cap);
     addWidget(foreground_slider);
 
+    addWidget(new QLabel("   Background  ", this));
+
+    background_slider = new SliderPlusBox(0, MAX_SLIDER_NO_IMAGE, 1.0, 1, this,
+                                          SliderPlusBox::ScaleType::Logarithmic);
+    background_slider->setValue(0);
+    background_slider->setToolTip("Black point of the color map (0 = off); hold B and use"
+                                  " the mouse wheel");
+    background_slider->setStyleSheet(sliderStyle);
+    background_slider->setMaximumWidth(slider_cap);
+    addWidget(background_slider);
+
     auto makeToggle = [this](const QString &text, const QString &tip) {
         auto *b = new QToolButton(this);
         b->setText(text);
@@ -39,7 +68,7 @@ JFJochViewerToolbarDisplay::JFJochViewerToolbarDisplay(QWidget *parent)
     hdr_mode_button = makeToggle("HDR", "High dynamic range: show the full intensity range unclipped");
     addWidget(hdr_mode_button);
 
-    addWidget(new QLabel("   Colour map  ", this));
+    addWidget(new QLabel("   Color map  ", this));
 
     // Initialize QComboBox with the options
     color_map_select = new QComboBox(this);
@@ -56,6 +85,7 @@ JFJochViewerToolbarDisplay::JFJochViewerToolbarDisplay(QWidget *parent)
     addWidget(color_map_select);
 
     connect(foreground_slider, &SliderPlusBox::valueChanged, this, &JFJochViewerToolbarDisplay::foregroundSet);
+    connect(background_slider, &SliderPlusBox::valueChanged, this, &JFJochViewerToolbarDisplay::backgroundSet);
     connect(color_map_select, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &JFJochViewerToolbarDisplay::colorComboBoxSet);
     connect(auto_foreground_button, &QToolButton::clicked, this, &JFJochViewerToolbarDisplay::autoForegroundButtonPressed);
@@ -69,9 +99,42 @@ void JFJochViewerToolbarDisplay::foregroundSet(double val) {
     emit setForeground(static_cast<float>(val));
 }
 
+void JFJochViewerToolbarDisplay::backgroundSet(double val) {
+    emit setBackground(static_cast<float>(val));
+}
+
+void JFJochViewerToolbarDisplay::updateBackground(float val) {
+    pending_background_ = val;
+    if (RemoteDisplayMode() && background_rate_.isValid()
+        && background_rate_.elapsed() < kRemoteRepaintIntervalMs) {
+        background_tail_timer_->start(kRemoteRepaintIntervalMs);
+        return;
+    }
+    background_tail_timer_->stop();
+    ApplyPendingBackground();
+}
+
+void JFJochViewerToolbarDisplay::ApplyPendingBackground() {
+    background_rate_.restart();
+    QSignalBlocker blocker(background_slider);
+    background_slider->setValue(pending_background_);
+}
+
 void JFJochViewerToolbarDisplay::updateForeground(float val) {
+    pending_foreground_ = val;
+    if (RemoteDisplayMode() && foreground_rate_.isValid()
+        && foreground_rate_.elapsed() < kRemoteRepaintIntervalMs) {
+        foreground_tail_timer_->start(kRemoteRepaintIntervalMs);
+        return;
+    }
+    foreground_tail_timer_->stop();
+    ApplyPendingForeground();
+}
+
+void JFJochViewerToolbarDisplay::ApplyPendingForeground() {
+    foreground_rate_.restart();
     QSignalBlocker blocker(foreground_slider);
-    foreground_slider->setValue(val);
+    foreground_slider->setValue(pending_foreground_);
 }
 
 void JFJochViewerToolbarDisplay::colorComboBoxSet(int val) {
@@ -87,6 +150,16 @@ void JFJochViewerToolbarDisplay::updateAutoForeground(bool val) {
     auto_foreground_button->setChecked(val);
 }
 
+void JFJochViewerToolbarDisplay::updateColorMap(int val) {
+    QSignalBlocker blocker(color_map_select);
+    color_map_select->setCurrentIndex(val);
+}
+
+void JFJochViewerToolbarDisplay::updateHDRMode(bool val) {
+    QSignalBlocker blocker(hdr_mode_button);
+    hdr_mode_button->setChecked(val);
+}
+
 void JFJochViewerToolbarDisplay::HDRModeButtonPressed() {
     emit setHDRMode(hdr_mode_button->isChecked());
 }
@@ -94,11 +167,15 @@ void JFJochViewerToolbarDisplay::HDRModeButtonPressed() {
 void JFJochViewerToolbarDisplay::imageLoaded(std::shared_ptr<const JFJochReaderImage> image) {
     if (image) {
         auto valid = image->ValidMinMax();
-        if (valid.has_value() && valid->second > 1)
+        if (valid.has_value() && valid->second > 1) {
             foreground_slider->setMax(valid->second);
-        else
+            background_slider->setMax(valid->second);
+        } else {
             foreground_slider->setMax(MAX_SLIDER_NO_IMAGE);
+            background_slider->setMax(MAX_SLIDER_NO_IMAGE);
+        }
     } else {
         foreground_slider->setMax(MAX_SLIDER_NO_IMAGE);
+        background_slider->setMax(MAX_SLIDER_NO_IMAGE);
     }
 }
diff --git a/viewer/toolbar/JFJochViewerToolbarDisplay.h b/viewer/toolbar/JFJochViewerToolbarDisplay.h
index 673fd39b0..0f41efe33 100644
--- a/viewer/toolbar/JFJochViewerToolbarDisplay.h
+++ b/viewer/toolbar/JFJochViewerToolbarDisplay.h
@@ -4,38 +4,64 @@
 #pragma once
 
 #include <QToolBar>
+#include <QElapsedTimer>
+#include <QTimer>
 #include "../widgets/SliderPlusBox.h"
 #include <QToolButton>
 #include <QComboBox>
 #include "../../reader/JFJochReaderImage.h"
 
-// Display toolbar: how the image is rendered — foreground (white-point) slider, auto-contrast,
-// HDR (full dynamic range), and the colour map. The two "Reanalyze" hero buttons are appended
-// to this bar by the main window.
+// Display toolbar: how the image is rendered — foreground (white-point) and background
+// (black-point) sliders, auto-contrast, HDR (full dynamic range), and the colour map. The two
+// "Reanalyze" hero buttons are appended to this bar by the main window.
 class JFJochViewerToolbarDisplay : public QToolBar {
     Q_OBJECT
 
     bool auto_foreground = false;
 
     SliderPlusBox *foreground_slider;
+    SliderPlusBox *background_slider;
     QToolButton *auto_foreground_button;
     QToolButton *hdr_mode_button;
     QComboBox *color_map_select;
+
+    // A ctrl-wheel or auto-foreground burst reports a new foreground per event, and on a remote
+    // display each slider update is a repaint of its own. Hold the readback to the remote
+    // cadence; the tail run shows the final value. The background readback (held B + wheel)
+    // gets the same treatment.
+    void ApplyPendingForeground();
+    float pending_foreground_ = 0.0f;
+    QElapsedTimer foreground_rate_;
+    QTimer *foreground_tail_timer_ = nullptr;
+    void ApplyPendingBackground();
+    float pending_background_ = 0.0f;
+    QElapsedTimer background_rate_;
+    QTimer *background_tail_timer_ = nullptr;
 public:
     JFJochViewerToolbarDisplay(QWidget *parent = nullptr);
 
+    // Current display settings, for persisting them across sessions (see JFJochViewerWindow).
+    [[nodiscard]] int colorMap() const { return color_map_select->currentIndex(); }
+    [[nodiscard]] bool autoForeground() const { return auto_foreground_button->isChecked(); }
+    [[nodiscard]] bool hdrMode() const { return hdr_mode_button->isChecked(); }
+
 signals:
     void setForeground(float val);
+    void setBackground(float val);
     void colorMapChanged(int val);
     void setAutoForeground(bool val);
     void setHDRMode(bool val);
 
 public slots:
     void updateForeground(float val);
+    void updateBackground(float val);
     void updateAutoForeground(bool val);
+    void updateColorMap(int val);
+    void updateHDRMode(bool val);
     void imageLoaded(std::shared_ptr<const JFJochReaderImage> image);
 private slots:
     void foregroundSet(double val);
+    void backgroundSet(double val);
     void colorComboBoxSet(int val);
     void autoForegroundButtonPressed();
     void HDRModeButtonPressed();
diff --git a/viewer/toolbar/JFJochViewerToolbarImage.cpp b/viewer/toolbar/JFJochViewerToolbarImage.cpp
index 8ab28efd2..3362a8905 100644
--- a/viewer/toolbar/JFJochViewerToolbarImage.cpp
+++ b/viewer/toolbar/JFJochViewerToolbarImage.cpp
@@ -4,6 +4,7 @@
 #include "JFJochViewerToolbarImage.h"
 #include <algorithm>
 #include <QTimer>
+#include "../RemoteDisplayMode.h"
 #include "../widgets/ToolbarIcons.h"
 
 JFJochViewerToolbarImage::JFJochViewerToolbarImage(QWidget *parent) : QToolBar(parent) {
@@ -45,6 +46,13 @@ JFJochViewerToolbarImage::JFJochViewerToolbarImage(QWidget *parent) : QToolBar(p
     image_number_slider_timer = new QTimer(this);
     image_number_slider_timer->setSingleShot(true);
 
+    number_tail_timer_ = new QTimer(this);
+    number_tail_timer_->setSingleShot(true);
+    connect(number_tail_timer_, &QTimer::timeout, this, [this] {
+        number_rate_.restart();
+        updateButtons();
+    });
+
     leftmost_button = makeButton(ToolbarIcons::first(), "First image", false);
     left_button = makeButton(ToolbarIcons::prev(), "Previous (by jump)", false);
 
@@ -151,6 +159,12 @@ void JFJochViewerToolbarImage::updateHttpButton() {
 void JFJochViewerToolbarImage::setImageNumber(int64_t total_images, int64_t current_image) {
     image_count_in_dataset = total_images;
     curr_image = current_image;
+    if (RemoteDisplayMode() && number_rate_.isValid() && number_rate_.elapsed() < kRemoteRepaintIntervalMs) {
+        number_tail_timer_->start(kRemoteRepaintIntervalMs);
+        return;
+    }
+    number_tail_timer_->stop();
+    number_rate_.restart();
     updateButtons();
 }
 
diff --git a/viewer/toolbar/JFJochViewerToolbarImage.h b/viewer/toolbar/JFJochViewerToolbarImage.h
index 88b9b9eb8..a8b3d7977 100644
--- a/viewer/toolbar/JFJochViewerToolbarImage.h
+++ b/viewer/toolbar/JFJochViewerToolbarImage.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QToolBar>
+#include <QElapsedTimer>
 #include <QLabel>
 #include <QToolButton>
 #include <QSlider>
@@ -39,6 +40,12 @@ class JFJochViewerToolbarImage : public QToolBar {
     QTimer *image_number_slider_timer;
     bool image_number_slider_manual = false;
 
+    // On a remote display the counter/slider would otherwise repaint once per produced frame
+    // during live follow or movie playback - a full-window upload each. Hold updateButtons()
+    // to the remote cadence; the tail run shows the final number.
+    QElapsedTimer number_rate_;
+    QTimer *number_tail_timer_ = nullptr;
+
     QToolButton *movie_button;
     QToolButton *open_button;
     QToolButton *autoload_button;
diff --git a/viewer/widgets/JFJochViewerFileBrowser.cpp b/viewer/widgets/JFJochViewerFileBrowser.cpp
new file mode 100644
index 000000000..eea5c61be
--- /dev/null
+++ b/viewer/widgets/JFJochViewerFileBrowser.cpp
@@ -0,0 +1,168 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "JFJochViewerFileBrowser.h"
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QToolButton>
+#include <QTreeView>
+#include <QHeaderView>
+#include <QFileDialog>
+#include <QSettings>
+#include <QDir>
+#include <QFileInfo>
+#include <QRegularExpression>
+
+namespace {
+    constexpr auto kDataRootEnvVar = "JUNGFRAUJOCH_DATA_ROOT";
+    constexpr auto kSettingsKey = "fileBrowserRoot";
+
+    // The filter box narrows files only; a directory always passes. Filtering directories too would
+    // hide everything below one whose own name does not match - including the files that do match -
+    // and would hide the root's ancestors, which leaves the tree with no valid root index at all.
+    class FileOnlyFilterProxy : public QSortFilterProxyModel {
+    public:
+        using QSortFilterProxyModel::QSortFilterProxyModel;
+
+    protected:
+        bool filterAcceptsRow(int row, const QModelIndex &parent) const override {
+            const auto *fs = qobject_cast<const QFileSystemModel *>(sourceModel());
+            if (fs && fs->isDir(fs->index(row, 0, parent)))
+                return true;
+            return QSortFilterProxyModel::filterAcceptsRow(row, parent);
+        }
+    };
+}
+
+QString JFJochViewerFileBrowser::SlsDataRoot(const QString &user) {
+    const auto match = QRegularExpression("\\Ae(\\d{5})\\z").match(user);
+    if (!match.hasMatch())
+        return {};
+    return "/sls/mx/data/p" + match.captured(1) + "/raw";
+}
+
+QString JFJochViewerFileBrowser::DefaultRoot() {
+    // Site default (e.g. a beamline launcher setting it to /sls/mx/data/p<group>), then whatever
+    // root was last browsed to (so re-launching without the variable set doesn't start over from
+    // scratch), then - for an SLS beamline account - that proposal's raw data, then the user's home
+    // - never the current directory, which for an installed binary is typically the install
+    // location rather than anywhere the user would keep data.
+    const QString env_root = qEnvironmentVariable(kDataRootEnvVar);
+    if (!env_root.isEmpty() && QDir(env_root).exists())
+        return env_root;
+
+    const QString last_root = QSettings("PSI", "jfjoch_viewer").value(kSettingsKey).toString();
+    if (!last_root.isEmpty() && QDir(last_root).exists())
+        return last_root;
+
+    // USER is the portable spelling Qt exposes; it is simply empty where the beamline directory
+    // could not exist anyway, so everyone else silently gets home, as before.
+    const QString sls_root = SlsDataRoot(qEnvironmentVariable("USER"));
+    if (!sls_root.isEmpty() && QDir(sls_root).exists())
+        return sls_root;
+
+    return QDir::homePath();
+}
+
+JFJochViewerFileBrowser::JFJochViewerFileBrowser(QWidget *parent) : QWidget(parent) {
+    auto *layout = new QVBoxLayout(this);
+    layout->setContentsMargins(4, 4, 4, 4);
+
+    auto *root_row = new QHBoxLayout();
+    root_edit_ = new QLineEdit(this);
+    root_edit_->setToolTip("Data root - type a path or use Browse…");
+    auto *browse_button = new QToolButton(this);
+    browse_button->setText("…");
+    browse_button->setToolTip("Browse for a data root…");
+    root_row->addWidget(root_edit_);
+    root_row->addWidget(browse_button);
+    layout->addLayout(root_row);
+
+    filter_edit_ = new QLineEdit(this);
+    filter_edit_->setPlaceholderText("Filter…");
+    filter_edit_->setClearButtonEnabled(true);
+    layout->addWidget(filter_edit_);
+
+    model_ = new QFileSystemModel(this);
+    model_->setFilter(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot);
+    // Directories are always listed regardless of these; only *_master.h5 / *_process.h5 and
+    // miniCBF frames among files. The many _data_NNNNNN.h5 shards of a dataset are not meant to be
+    // opened directly; a .cbf is one frame per file, and opening any of them opens its whole sweep.
+    model_->setNameFilters({"*_master.h5", "*_process.h5", "*.cbf"});
+    model_->setNameFilterDisables(false);   // hide non-matching files rather than just greying them out
+
+    proxy_ = new FileOnlyFilterProxy(this);
+    proxy_->setSourceModel(model_);
+    proxy_->setFilterKeyColumn(0);
+    proxy_->setFilterCaseSensitivity(Qt::CaseInsensitive);
+    // Deliberately not recursive: it only ever narrows names already listed at an expanded level,
+    // never forces fetching a collapsed subtree just to search inside it.
+
+    tree_ = new QTreeView(this);
+    tree_->setModel(proxy_);
+    tree_->setHeaderHidden(true);
+    for (int col = 1; col < model_->columnCount(); ++col)
+        tree_->hideColumn(col);
+    tree_->setSortingEnabled(false);
+    layout->addWidget(tree_);
+
+    connect(browse_button, &QToolButton::clicked, this, &JFJochViewerFileBrowser::onBrowseClicked);
+    connect(root_edit_, &QLineEdit::editingFinished, this, &JFJochViewerFileBrowser::onRootEditingFinished);
+    connect(filter_edit_, &QLineEdit::textChanged, proxy_, &QSortFilterProxyModel::setFilterFixedString);
+    connect(tree_, &QTreeView::doubleClicked, this, &JFJochViewerFileBrowser::onDoubleClicked);
+
+    SetRoot(DefaultRoot());
+}
+
+void JFJochViewerFileBrowser::SetRoot(const QString &path) {
+    QDir dir(path);
+    if (!dir.exists())
+        return;
+
+    const QString canonical = QDir::toNativeSeparators(dir.absolutePath());
+    root_edit_->setText(canonical);
+    model_->setRootPath(canonical);
+    tree_->setRootIndex(proxy_->mapFromSource(model_->index(canonical)));
+
+    QSettings("PSI", "jfjoch_viewer").setValue(kSettingsKey, canonical);
+}
+
+void JFJochViewerFileBrowser::ResetToDefaultRoot() {
+    SetRoot(DefaultRoot());
+}
+
+void JFJochViewerFileBrowser::FollowPath(const QString &path) {
+    const QString absolute = QFileInfo(path).absoluteFilePath();
+    // Containment by path components, not by string prefix, so /data/foo2 is not inside /data/foo.
+    // relativeFilePath hands back an absolute path when there is no relative route at all (a file on
+    // another Windows drive).
+    const QString relative = QDir(model_->rootPath()).relativeFilePath(absolute);
+    if (QDir::isAbsolutePath(relative) || relative == ".." || relative.startsWith("../"))
+        return;
+
+    const QModelIndex index = proxy_->mapFromSource(model_->index(absolute));
+    if (!index.isValid())
+        return;
+
+    tree_->setCurrentIndex(index);
+    tree_->scrollTo(index);
+}
+
+void JFJochViewerFileBrowser::onBrowseClicked() {
+    const QString dir = QFileDialog::getExistingDirectory(this, "Select data root", root_edit_->text());
+    if (!dir.isEmpty())
+        SetRoot(dir);
+}
+
+void JFJochViewerFileBrowser::onRootEditingFinished() {
+    SetRoot(root_edit_->text());
+}
+
+void JFJochViewerFileBrowser::onDoubleClicked(const QModelIndex &index) {
+    const QModelIndex source = proxy_->mapToSource(index);
+    if (!source.isValid() || model_->isDir(source))
+        return;   // directories: let the tree's own expand/collapse handle the double click
+    emit openDataset(QDir::toNativeSeparators(model_->filePath(source)), 0, 1, false);
+}
diff --git a/viewer/widgets/JFJochViewerFileBrowser.h b/viewer/widgets/JFJochViewerFileBrowser.h
new file mode 100644
index 000000000..067bffd6f
--- /dev/null
+++ b/viewer/widgets/JFJochViewerFileBrowser.h
@@ -0,0 +1,54 @@
+// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+#include <QWidget>
+#include <QFileSystemModel>
+#include <QSortFilterProxyModel>
+
+class QLineEdit;
+class QTreeView;
+class QModelIndex;
+
+// Left-side dock alternative to the Processing (reprocessing settings) panel: a directory tree rooted at a
+// configurable data root, filtered down to subdirectories and *_master.h5 / *_process.h5 / *.cbf
+// files, for browsing to and opening a dataset without caring about reprocessing. Backed by QFileSystemModel,
+// which only lists a directory once it is expanded - so a root with hundreds of sibling directories
+// (e.g. an SLS beamline's /sls/mx/data/) costs one readdir at each level actually opened, never a
+// recursive scan of the whole tree.
+class JFJochViewerFileBrowser : public QWidget {
+    Q_OBJECT
+
+    QLineEdit *root_edit_;
+    QLineEdit *filter_edit_;
+    QTreeView *tree_;
+    QFileSystemModel *model_;
+    QSortFilterProxyModel *proxy_;
+
+    void SetRoot(const QString &path);
+    [[nodiscard]] static QString DefaultRoot();
+    // An SLS account eNNNNN browses its proposal group's raw data, which is pNNNNN with the
+    // same five digits; empty for any other user name, on any platform.
+    [[nodiscard]] static QString SlsDataRoot(const QString &user);
+
+public slots:
+    // "Reset all settings to defaults": back to the root a fresh start would pick.
+    void ResetToDefaultRoot();
+
+private slots:
+    void onBrowseClicked();
+    void onRootEditingFinished();
+    void onDoubleClicked(const QModelIndex &index);
+
+signals:
+    // Mirrors JFJochViewerMenu::fileOpenSelected, so the window wires it to LoadFile the same way.
+    void openDataset(const QString &filename, qint64 image_number, qint64 summation, bool retry);
+
+public:
+    explicit JFJochViewerFileBrowser(QWidget *parent = nullptr);
+
+    // A dataset opened elsewhere (menu, D-Bus) and lying inside the current root moves the tree's
+    // selection to it; one outside the root leaves the browser exactly as it was.
+    void FollowPath(const QString &path);
+};
diff --git a/viewer/widgets/JFJochViewerImageStatistics.cpp b/viewer/widgets/JFJochViewerImageStatistics.cpp
index da6265d84..c7e32d964 100644
--- a/viewer/widgets/JFJochViewerImageStatistics.cpp
+++ b/viewer/widgets/JFJochViewerImageStatistics.cpp
@@ -6,14 +6,28 @@
 #include <QFormLayout>
 #include <QRegularExpression>
 
-static QString mkUnitCell(const UnitCell &uc) {
-    return QString("<b>%1</b> Å <b>%2</b> Å <b>%3</b> Å <b>%4</b>° <b>%5</b>° <b>%6</b>°")
-            .arg(QString::number(uc.a, 'f', 1))
-            .arg(QString::number(uc.b, 'f', 1))
-            .arg(QString::number(uc.c, 'f', 1))
-            .arg(QString::number(uc.alpha, 'f', 1))
-            .arg(QString::number(uc.beta, 'f', 1))
-            .arg(QString::number(uc.gamma, 'f', 1));
+// Two aligned rows - the lengths over their angles, so that alpha sits below a, beta below b,
+// gamma below c. Qt's rich text does not inherit a surrounding colour into a table, so the
+// colour is applied per cell.
+static QString mkUnitCell(const UnitCell &uc, const char *color = nullptr) {
+    const QString style = color ? QString(" style=\"color: %1;\"").arg(color) : QString();
+    auto num = [&style](double v) {
+        // Padded to three integer digits with figure spaces (digit-wide), so the columns hold
+        // still as values change magnitude; no axis reaches 1000 Å and no angle 1000°.
+        QString s = QString::number(v, 'f', 1);
+        while (s.size() < 5)
+            s.prepend(QChar(0x2007));
+        return QString("<td align=\"right\"%1><b>%2</b>&nbsp;&nbsp;</td>")
+                .arg(style).arg(s);
+    };
+    auto unit = [&style](const char *u) {
+        return QString("<td%1>%2</td>").arg(style).arg(u);
+    };
+    return "<table cellspacing=\"0\" cellpadding=\"0\"><tr>"
+           + num(uc.a) + num(uc.b) + num(uc.c) + unit("Å")
+           + "</tr><tr>"
+           + num(uc.alpha) + num(uc.beta) + num(uc.gamma) + unit("°")
+           + "</tr></table>";
 }
 
 static QString mkSourceInstrumentText(const DiffractionExperiment& exp) {
@@ -89,11 +103,14 @@ static QString mkSymmetry(const LatticeMessage& sym) {
 JFJochViewerImageStatistics::JFJochViewerImageStatistics(QWidget *parent) : QWidget(parent) {
     QFormLayout* layout = new QFormLayout(this);
 
+    // Order: what the dataset is, then how it was collected, then what this image contains.
     dataset_name = new QLabel(this);
+    dataset_name->setWordWrap(true);
     layout->addRow(new QLabel("Dataset:"), dataset_name);
 
-    detector_name = new QLabel(this);
-    layout->addRow(new QLabel("Detector:"), detector_name);
+    collection_time = new QLabel(this);
+    collection_time->setWordWrap(true);
+    layout->addRow(new QLabel("Collection time:"), collection_time);
 
     source_name = new QLabel(this);
     layout->addRow("Source / Instrument:", source_name);
@@ -101,6 +118,18 @@ JFJochViewerImageStatistics::JFJochViewerImageStatistics(QWidget *parent) : QWid
     sample_name = new QLabel(this);
     layout->addRow("Sample:", sample_name);
 
+    detector_name = new QLabel(this);
+    layout->addRow(new QLabel("Detector:"), detector_name);
+
+    detector_distance = new QLabel(this);
+    layout->addRow(new QLabel("Detector distance:"), detector_distance);
+
+    beam_center = new QLabel(this);
+    layout->addRow(new QLabel("Beam center:"), beam_center);
+
+    wavelength = new QLabel(this);
+    layout->addRow(new QLabel("Wavelength:"), wavelength);
+
     exposure_time = new QLabel(this);
     layout->addRow(new QLabel("Exposure Time:"), exposure_time);
 
@@ -108,6 +137,12 @@ JFJochViewerImageStatistics::JFJochViewerImageStatistics(QWidget *parent) : QWid
     rotation_angle = new QLabel(this);
     layout->addRow(rotation_angle_label, rotation_angle);
 
+    // Sample-head angles that do not move during a run (an SLS Smargon writes chi and phi). Both
+    // labels stay empty for a file that carries none, so the row costs nothing where it means nothing.
+    smargon_label = new QLabel(this);
+    smargon_angles = new QLabel(this);
+    layout->addRow(smargon_label, smargon_angles);
+
     valid_values = new QLabel(this);
     layout->addRow(new QLabel("Valid values:"), valid_values);
 
@@ -132,9 +167,6 @@ JFJochViewerImageStatistics::JFJochViewerImageStatistics(QWidget *parent) : QWid
     profile_radius_label = new QLabel("");
     profile_radius = new QLabel(this);
     layout->addRow(profile_radius_label, profile_radius);
-
-    b_factor = new QLabel(this);
-    layout->addRow(new QLabel("B-factor:"), b_factor);
 }
 
 QString TrimZeros(double number, int precision) {
@@ -154,14 +186,20 @@ void JFJochViewerImageStatistics::loadImage(std::shared_ptr<const JFJochReaderIm
         source_name->setText("");
         sample_name->setText("");
         dataset_name->setText("");
-        dataset_name->setToolTip("");
+        collection_time->setText("");
         detector_name->setText("");
         detector_name->setToolTip("");
+        detector_distance->setText("");
+        beam_center->setText("");
+        wavelength->setText("");
+        wavelength->setToolTip("");
         exposure_time->setText("");
         exposure_time->setToolTip("");
         rotation_angle->setText("");
         rotation_angle->setToolTip("");
         rotation_angle_label->setText("");
+        smargon_label->setText("");
+        smargon_angles->setText("");
         valid_values->setText("");
         valid_values->setToolTip("");
         spots->setText("");
@@ -169,7 +207,6 @@ void JFJochViewerImageStatistics::loadImage(std::shared_ptr<const JFJochReaderIm
         indexed->setText("");
         indexed->setToolTip("");
         multiple_lattices->setText("");
-        b_factor->setText("");
         profile_radius_label->setText("");
         profile_radius->setText("");
         profile_radius->setToolTip("");
@@ -183,15 +220,26 @@ void JFJochViewerImageStatistics::loadImage(std::shared_ptr<const JFJochReaderIm
 
     auto &exp = image->Dataset().experiment;
 
-    text = QString("<b>%1</b>").arg(QString::fromStdString(exp.GetFilePrefix()));
+    // Word-wrap alone would break wherever it likes (mid-directory-name); a zero-width space after
+    // every "/" gives it a preferred break point there, so a long path wraps like a path and only
+    // falls back to breaking a single component if that component alone doesn't fit.
+    QString path = QString::fromStdString(exp.GetFilePrefix());
+    path.replace('/', QString("/") + QChar(0x200B));   // U+200B ZERO WIDTH SPACE, a break opportunity
+    text = QString("<b>%1</b>").arg(path);
     dataset_name->setText(text);
-    dataset_name->setToolTip(QString("Collection data: <b>%1</b><br/>Beam center: <b>%2</b> <b>%3</b> pxl<br/>Detector distance: <b>%4</b> mm<br/>Energy: <b>%5</b> eV<br/>Wavelength: <b>%6</b> Å")
-        .arg(QString::fromStdString(utc_to_local_human_readable(image->Dataset().arm_date)))
+
+    const QString collected = QString::fromStdString(utc_to_local_human_readable(image->Dataset().arm_date));
+    collection_time->setText(collected.isEmpty() ? QString("-") : QString("<b>%1</b>").arg(collected));
+
+    detector_distance->setText(QString("<b>%1</b> mm").arg(QString::number(exp.GetDetectorDistance_mm(), 'f', 3)));
+
+    beam_center->setText(QString("<b>%1</b> <b>%2</b> pxl")
         .arg(QString::number(exp.GetBeamX_pxl(), 'f', 2))
-        .arg(QString::number(exp.GetBeamY_pxl(), 'f', 2))
-        .arg(QString::number(exp.GetDetectorDistance_mm(), 'f', 3))
-        .arg(QString::number(exp.GetIncidentEnergy_keV() * 1000.0, 'f', 0))
-        .arg(QString::number(exp.GetWavelength_A(), 'f', 3)));
+        .arg(QString::number(exp.GetBeamY_pxl(), 'f', 2)));
+
+    wavelength->setText(QString("<b>%1</b> Å").arg(QString::number(exp.GetWavelength_A(), 'f', 4)));
+    wavelength->setToolTip(QString("Energy: <b>%1</b> eV")
+        .arg(QString::number(exp.GetIncidentEnergy_keV() * 1000.0, 'f', 0)));
 
     text = QString("<b>%1</b>").arg(QString::fromStdString(exp.GetDetectorDescription()));
     detector_name->setToolTip(QString("Width: <b>%1</b> pxl (<b>%2</b> mm)<br/>Height: <b>%3</b> pxl (<b>%4</b> mm)<br/>Pixel size: <b>%5</b> μm")
@@ -202,17 +250,20 @@ void JFJochViewerImageStatistics::loadImage(std::shared_ptr<const JFJochReaderIm
             .arg(QString::number(exp.GetPixelSize_mm() * 1000.0, 'f', 0)));
     detector_name->setText(text);
 
-    source_name->setText(mkSourceInstrumentText(exp));
+    source_name->setText(QString("<b>%1</b>").arg(mkSourceInstrumentText(exp)));
     source_name->setToolTip(mkSourceInstrumentTooltip(exp));
 
-    sample_name->setText(mkSampleText(exp));
+    sample_name->setText(QString("<b>%1</b>").arg(mkSampleText(exp)));
     sample_name->setToolTip(mkSampleTooltip(exp));
 
     if (exp.GetGoniometer()) {
+        // An axis that is present but does not turn has no wedge to add: state the angle it stands at.
+        const float wedge = exp.GetGoniometer()->GetWedge_deg();
+        const QString angle = TrimZeros(exp.GetGoniometer()->GetAngle_deg(image->ImageData().number), 3);
         rotation_angle_label->setText("Image angle:");
-        rotation_angle->setText(QString("<b>%1° + %2°</b>")
-            .arg(TrimZeros(exp.GetGoniometer()->GetAngle_deg(image->ImageData().number), 3))
-            .arg(TrimZeros(exp.GetGoniometer()->GetWedge_deg(), 3)));
+        rotation_angle->setText(wedge == 0.0f
+            ? QString("<b>%1°</b>").arg(angle)
+            : QString("<b>%1° + %2°</b>").arg(angle).arg(TrimZeros(wedge, 3)));
         rotation_angle->setToolTip(QString("Start angle: <b>%1°</b><br/>Increment: <b>%2°</b>")
             .arg(TrimZeros(exp.GetGoniometer()->GetStart_deg(), 3))
             .arg(TrimZeros(exp.GetGoniometer()->GetIncrement_deg(), 3))
@@ -234,6 +285,16 @@ void JFJochViewerImageStatistics::loadImage(std::shared_ptr<const JFJochReaderIm
         rotation_angle->setToolTip("");
     }
 
+    if (const auto head = exp.GetDatasetSettings().GetSmargonPosition()) {
+        smargon_label->setText("Smargon:");
+        smargon_angles->setText(QString("chi <b>%1</b>° / phi <b>%2</b>°")
+            .arg(TrimZeros(head->chi_deg, 3))
+            .arg(TrimZeros(head->phi_deg, 3)));
+    } else {
+        smargon_label->setText("");
+        smargon_angles->setText("");
+    }
+
     exposure_time->setText(QString("<b>%1</b> s").arg(FormatTime(exp.GetImageTime())));
     exposure_time->setToolTip(QString("Count time: <b>%1</b> s<br/>").arg(FormatTime(exp.GetImageCountTime())));
 
@@ -268,7 +329,7 @@ void JFJochViewerImageStatistics::loadImage(std::shared_ptr<const JFJochReaderIm
     auto pr = image->ImageData().profile_radius;
     auto mos = image->ImageData().mosaicity_deg;
     if (mos && std::isfinite(mos.value())) {
-        text = QString("<b>%1</b>°").arg(QString::number(mos.value(), 'f', 6));
+        text = QString("<b>%1</b>°").arg(QString::number(mos.value(), 'f', 2));
         profile_radius_label->setText("Mosaicity:");
         profile_radius->setText(text);
         if (pr && std::isfinite(pr.value())) {
@@ -287,14 +348,6 @@ void JFJochViewerImageStatistics::loadImage(std::shared_ptr<const JFJochReaderIm
         profile_radius->setToolTip("");
     }
 
-    auto b = image->ImageData().b_factor;
-    if (b && std::isfinite(b.value()))  {
-        text = QString("<b>%1</b> Å<sup>2</sup>").arg(QString::number(b.value(), 'f', 2));
-        b_factor->setText(text);
-    } else {
-        b_factor->setText("N/A");
-    }
-
     auto res = image->ImageData().resolution_estimate;
     if (res && std::isfinite(res.value())) {
         text = QString("<b>%1</b> Å").arg(QString::number(res.value(), 'f', 2));
@@ -327,8 +380,7 @@ void JFJochViewerImageStatistics::loadImage(std::shared_ptr<const JFJochReaderIm
 
         auto latt = image->ImageData().indexing_lattice;
         if (latt) {
-            text = QString("<span style=\"color: purple;\">%1</span>")
-                    .arg(mkUnitCell(latt->GetUnitCell()));
+            text = mkUnitCell(latt->GetUnitCell(), "purple");
 
             auto vec0 = latt->Vec0();
             auto vec1 = latt->Vec1();
@@ -356,7 +408,8 @@ void JFJochViewerImageStatistics::loadImage(std::shared_ptr<const JFJochReaderIm
                             .arg(QString::fromStdString(image->Dataset().experiment.GetSpaceGroupName()));
             }
         } else
-            text = QString("<span style=\"color: red;\"><b>No lattice</b></span>");
+            // Not indexed is a normal state, not an error - grey, so red keeps meaning trouble.
+            text = QString("<span style=\"color: gray;\">No lattice</span>");
 
         indexed->setToolTip(tooltip);
         indexed->setText(text);
diff --git a/viewer/widgets/JFJochViewerImageStatistics.h b/viewer/widgets/JFJochViewerImageStatistics.h
index 861c1c63a..090724023 100644
--- a/viewer/widgets/JFJochViewerImageStatistics.h
+++ b/viewer/widgets/JFJochViewerImageStatistics.h
@@ -13,10 +13,16 @@ class JFJochViewerImageStatistics : public QWidget {
     QLabel *source_name;
     QLabel *sample_name;
     QLabel *dataset_name;
+    QLabel *collection_time;
     QLabel *detector_name;
+    QLabel *detector_distance;
+    QLabel *beam_center;
+    QLabel *wavelength;
     QLabel *exposure_time;
     QLabel *rotation_angle_label;
     QLabel *rotation_angle;
+    QLabel *smargon_label;
+    QLabel *smargon_angles;
     QLabel *spots;
     QLabel *valid_values;
     QLabel *indexed;
@@ -25,7 +31,6 @@ class JFJochViewerImageStatistics : public QWidget {
     QLabel *res_estimate;
     QLabel *masked_pixels;
 
-    QLabel *b_factor;
     QLabel *profile_radius_label;
     QLabel *profile_radius;
 public:
diff --git a/viewer/widgets/JFJochViewerImageStrip.cpp b/viewer/widgets/JFJochViewerImageStrip.cpp
deleted file mode 100644
index 1c8457150..000000000
--- a/viewer/widgets/JFJochViewerImageStrip.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
-// SPDX-License-Identifier: GPL-3.0-only
-
-#include "JFJochViewerImageStrip.h"
-
-#include <QComboBox>
-#include <QCheckBox>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QScrollArea>
-#include <QToolButton>
-#include <QLabel>
-#include <QPixmap>
-#include <QStyle>
-#include <QRandomGenerator>
-#include <QResizeEvent>
-
-#include <algorithm>
-#include <numeric>
-#include <cmath>
-#include <utility>
-
-JFJochViewerImageStrip::JFJochViewerImageStrip(QWidget *parent) : QWidget(parent) {
-    auto *layout = new QVBoxLayout(this);
-    layout->setContentsMargins(4, 2, 4, 2);
-
-    auto *controls = new QHBoxLayout();
-    controls->addWidget(new QLabel("Show", this));
-    mode_ = new QComboBox(this);
-    mode_->addItem("Evenly spaced", 0);
-    mode_->addItem("Most spots", 1);
-    mode_->addItem("Indexed", 2);
-    mode_->addItem("Resolution", 3);     // representatives across the resolution range
-    mode_->addItem("Background", 4);      // representatives across the background range
-    controls->addWidget(mode_);
-    spots_ = new QCheckBox("Spots", this);
-    spots_->setChecked(true);
-    spots_->setToolTip("Overlay found spots — a real pattern reads like a constellation");
-    controls->addWidget(spots_);
-    auto *refresh = new QToolButton(this);
-    refresh->setIcon(style()->standardIcon(QStyle::SP_BrowserReload));
-    refresh->setAutoRaise(true);
-    refresh->setCursor(Qt::PointingHandCursor);
-    refresh->setToolTip("Re-roll the representative selection");
-    controls->addWidget(refresh);
-    controls->addStretch();
-    layout->addLayout(controls);
-    connect(refresh, &QToolButton::clicked, this, [this] { Rebuild(); });
-
-    scroll_ = new QScrollArea(this);
-    scroll_->setWidgetResizable(true);
-    scroll_->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    scroll_->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-    scroll_->setMinimumHeight(48);   // let the dock shrink; thumbnails scale to fit
-    auto *stripWidget = new QWidget(scroll_);
-    strip_ = new QHBoxLayout(stripWidget);
-    strip_->setContentsMargins(0, 0, 0, 0);
-    strip_->addStretch();
-    scroll_->setWidget(stripWidget);
-    layout->addWidget(scroll_);
-
-    connect(mode_, &QComboBox::currentIndexChanged, this, [this] { Rebuild(); });
-    connect(spots_, &QCheckBox::toggled, this, [this] { Rebuild(); });
-}
-
-void JFJochViewerImageStrip::datasetLoaded(std::shared_ptr<const JFJochReaderDataset> dataset) {
-    // Store the latest dataset (metrics may update during live sync / re-analysis) but do NOT
-    // rebuild here — that would refetch thumbnails on every HTTP image update. Rebuilding happens
-    // on file open (resetForNewFile, which fires just after this) and on mode / Spots / Refresh.
-    dataset_ = std::move(dataset);
-}
-
-void JFJochViewerImageStrip::resetForNewFile() {
-    Rebuild();   // a new file/stream opened; dataset_ was just set by datasetLoaded
-}
-
-void JFJochViewerImageStrip::thumbnailReady(qint64 image_number, QImage thumb) {
-    auto it = slots_.find(image_number);
-    if (it != slots_.end())
-        it.value()->setIcon(QPixmap::fromImage(thumb));
-}
-
-QVector<qint64> JFJochViewerImageStrip::ComputeRepresentatives() const {
-    QVector<qint64> result;
-    if (!dataset_)
-        return result;
-    const int64_t total = dataset_->experiment.GetImageNum();
-    if (total <= 0)
-        return result;
-    const int N = static_cast<int>(std::min<int64_t>(8, total));
-    const int mode = mode_->currentIndex();
-    auto *rng = QRandomGenerator::global();
-
-    // Pick one random image from each of N equal bins over an ordered candidate list. Stochastic,
-    // so Refresh re-rolls a fresh set and deterministic-spacing artefacts are avoided.
-    auto binnedRandom = [&](const std::vector<int64_t> &candidates) {
-        const size_t M = candidates.size();
-        if (M == 0)
-            return;
-        const int n = static_cast<int>(std::min<size_t>(N, M));
-        for (int i = 0; i < n; ++i) {
-            const size_t lo = static_cast<size_t>(i) * M / n;
-            size_t hi = static_cast<size_t>(i + 1) * M / n;
-            if (hi <= lo) hi = lo + 1;
-            result.push_back(candidates[lo + rng->bounded(static_cast<quint32>(hi - lo))]);
-        }
-    };
-
-    // Image indices ordered by a metric (finite values only), low to high.
-    auto orderedByMetric = [](const std::vector<float> &metric) {
-        std::vector<std::pair<float, int64_t>> vals;
-        for (size_t i = 0; i < metric.size(); ++i)
-            if (std::isfinite(metric[i]))
-                vals.push_back({metric[i], static_cast<int64_t>(i)});
-        std::sort(vals.begin(), vals.end());
-        std::vector<int64_t> idx;
-        idx.reserve(vals.size());
-        for (const auto &v : vals) idx.push_back(v.second);
-        return idx;
-    };
-
-    std::vector<int64_t> allIndices(total);
-    std::iota(allIndices.begin(), allIndices.end(), 0);
-
-    const auto &sc = dataset_->spot_count;
-    const auto &sci = dataset_->spot_count_indexed;
-
-    if (mode == 1 && !sc.empty()) {                 // most spots (deterministic top-N)
-        std::vector<int64_t> idx(sc.size());
-        std::iota(idx.begin(), idx.end(), 0);
-        const size_t n = std::min<size_t>(N, idx.size());
-        std::partial_sort(idx.begin(), idx.begin() + n, idx.end(),
-                          [&](int64_t a, int64_t b) { return sc[a] > sc[b]; });
-        idx.resize(n);
-        std::sort(idx.begin(), idx.end());
-        for (int64_t i : idx) result.push_back(i);
-    } else if (mode == 2 && !sci.empty()) {         // indexed images, spaced random
-        std::vector<int64_t> indexed;
-        for (size_t i = 0; i < sci.size(); ++i)
-            if (sci[i] > 0) indexed.push_back(static_cast<int64_t>(i));
-        binnedRandom(indexed.empty() ? allIndices : indexed);
-    } else if (mode == 3 && !dataset_->resolution_estimate.empty()) {
-        binnedRandom(orderedByMetric(dataset_->resolution_estimate));
-    } else if (mode == 4 && !dataset_->bkg_estimate.empty()) {
-        binnedRandom(orderedByMetric(dataset_->bkg_estimate));
-    } else {                                        // evenly spaced (random within each bin)
-        binnedRandom(allIndices);
-    }
-    return result;
-}
-
-void JFJochViewerImageStrip::Rebuild() {
-    // Clear the strip (keep the trailing stretch).
-    slots_.clear();
-    while (strip_->count() > 1) {
-        QLayoutItem *item = strip_->takeAt(0);
-        if (item->widget())
-            item->widget()->deleteLater();
-        delete item;
-    }
-    if (!dataset_)
-        return;
-
-    const QVector<qint64> reps = ComputeRepresentatives();
-    int pos = 0;
-    for (qint64 n : reps) {
-        auto *btn = new QToolButton(this);
-        btn->setToolButtonStyle(Qt::ToolButtonIconOnly);   // the image number is drawn in the bitmap
-        btn->setAutoRaise(true);
-        btn->setCursor(Qt::PointingHandCursor);
-        btn->setToolTip(QStringLiteral("Open image %1").arg(n + 1));
-        connect(btn, &QToolButton::clicked, this, [this, n] { emit imageSelected(n, 1); });
-        strip_->insertWidget(pos++, btn);
-        slots_[n] = btn;
-    }
-    UpdateThumbnailSize();
-    emit requestThumbnails(reps, spots_->isChecked());
-}
-
-void JFJochViewerImageStrip::UpdateThumbnailSize() {
-    if (!scroll_)
-        return;
-    // Scale the thumbnails to the available height so the strip never needs more room than it has.
-    const int h = std::clamp(scroll_->viewport()->height() - 4, 40, 240);
-    for (auto *btn : std::as_const(slots_))
-        btn->setIconSize(QSize(h, h));
-}
-
-void JFJochViewerImageStrip::resizeEvent(QResizeEvent *event) {
-    QWidget::resizeEvent(event);
-    UpdateThumbnailSize();
-}
diff --git a/viewer/widgets/JFJochViewerImageStrip.h b/viewer/widgets/JFJochViewerImageStrip.h
deleted file mode 100644
index f1b5404b4..000000000
--- a/viewer/widgets/JFJochViewerImageStrip.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
-// SPDX-License-Identifier: GPL-3.0-only
-
-#pragma once
-
-#include <QWidget>
-#include <QMap>
-#include <memory>
-
-#include "../../reader/JFJochReaderDataset.h"
-
-class QComboBox;
-class QCheckBox;
-class QHBoxLayout;
-class QToolButton;
-class QScrollArea;
-class QResizeEvent;
-
-// A strip of thumbnails for a handful of representative images (evenly spaced, most spots, or
-// indexed), optionally overlaid with spots so a real pattern reads like a constellation. Clicking
-// a thumbnail opens that image. Thumbnails are rendered off-thread by the reading worker.
-class JFJochViewerImageStrip : public QWidget {
-    Q_OBJECT
-public:
-    explicit JFJochViewerImageStrip(QWidget *parent = nullptr);
-
-public slots:
-    void datasetLoaded(std::shared_ptr<const JFJochReaderDataset> dataset);
-    void thumbnailReady(qint64 image_number, QImage thumb);
-    void resetForNewFile();   // a new file/stream opened: rebuild once, then stay put on live updates
-
-signals:
-    void requestThumbnails(QVector<qint64> image_numbers, bool show_spots);
-    void imageSelected(int64_t image_number, int64_t summation);
-
-protected:
-    void resizeEvent(QResizeEvent *event) override;
-
-private:
-    std::shared_ptr<const JFJochReaderDataset> dataset_;
-    QComboBox *mode_ = nullptr;
-    QCheckBox *spots_ = nullptr;
-    QScrollArea *scroll_ = nullptr;
-    QHBoxLayout *strip_ = nullptr;
-    QMap<qint64, QToolButton *> slots_;   // image number -> its thumbnail button
-
-    QVector<qint64> ComputeRepresentatives() const;
-    void Rebuild();
-    void UpdateThumbnailSize();   // scale thumbnails to the available dock height
-};
diff --git a/viewer/widgets/JFJochViewerSettingsDock.cpp b/viewer/widgets/JFJochViewerSettingsDock.cpp
index 8a7e52f02..cc1cbeaf6 100644
--- a/viewer/widgets/JFJochViewerSettingsDock.cpp
+++ b/viewer/widgets/JFJochViewerSettingsDock.cpp
@@ -78,10 +78,12 @@ JFJochViewerSettingsDock::JFJochViewerSettingsDock(const SpotFindingSettings &sp
     // The two analysis actions sit on top of the panel. "Analyze image" is a toggle (re-analyse the
     // current frame now and on every change while armed); "Analyze dataset" launches a processing job
     // whose kind (MX vs azimuthal) is decided by the MX/AzInt toggle below — no separate switch.
+    // The armed (checked) state stays navy like its sibling - a full coral fill read as a
+    // different kind of button - and is marked by a coral outline instead.
     const QString heroStyle =
-        "QPushButton { background-color:#1F3A5F; color:white; border:none; border-radius:3px;"
-        " padding:5px 10px; } QPushButton:hover { background-color:#16314f; }"
-        " QPushButton:checked { background-color:#FA7268; } QPushButton:disabled { background-color:#9aa6b3; }";
+        "QPushButton { background-color:#1F3A5F; color:white; border:2px solid transparent;"
+        " border-radius:3px; padding:3px 8px; } QPushButton:hover { background-color:#16314f; }"
+        " QPushButton:checked { border-color:#FA7268; } QPushButton:disabled { background-color:#9aa6b3; }";
     auto *analyzeImageBtn = new QPushButton(FramesIcon(1), " Analyze image", this);
     analyzeImageBtn->setCheckable(true);
     analyzeImageBtn->setStyleSheet(heroStyle);
@@ -142,6 +144,7 @@ JFJochViewerSettingsDock::JFJochViewerSettingsDock(const SpotFindingSettings &sp
     layout->addWidget(azintSection_);
     layout->addWidget(stack);
     layout->addStretch();
+
 }
 
 void JFJochViewerSettingsDock::setHttpConnection(bool connected, QString) {
@@ -158,10 +161,13 @@ QWidget *JFJochViewerSettingsDock::BuildGeometrySection() {
 
     energy_ = new NumberLineEdit(1.0, 200.0, 12.4, 4, "keV", this);
     distance_ = new NumberLineEdit(10.0, 5000.0, 100.0, 2, "mm", this);
-    beamX_ = new NumberLineEdit(-20000.0, 20000.0, 0.0, 1, "px", this);
-    beamY_ = new NumberLineEdit(-20000.0, 20000.0, 0.0, 1, "px", this);
-    rot1_ = new NumberLineEdit(-180.0, 180.0, 0.0, 3, "°", this);
-    rot2_ = new NumberLineEdit(-180.0, 180.0, 0.0, 3, "°", this);
+    // Fields that share a row carry their unit in the row label instead of in a suffix: a spin box
+    // asks to be as wide as its longest possible value, and two or three of those abreast are wider
+    // than the dock. The panel already names units this way ("High resolution [Å]").
+    beamX_ = new NumberLineEdit(-20000.0, 20000.0, 0.0, 1, "", this);
+    beamY_ = new NumberLineEdit(-20000.0, 20000.0, 0.0, 1, "", this);
+    rot1_ = new NumberLineEdit(-180.0, 180.0, 0.0, 3, "", this);
+    rot2_ = new NumberLineEdit(-180.0, 180.0, 0.0, 3, "", this);
     // Both are overwritten from the experiment as soon as a dataset is open; this is what they show
     // until then.
     polarizationOn_ = new QCheckBox("Polarization correction", this);
@@ -197,9 +203,9 @@ QWidget *JFJochViewerSettingsDock::BuildGeometrySection() {
 
     geom->addRow("Photon energy", energy_);
     geom->addRow("Detector distance", distance_);
-    geom->addRow("Beam origin", beam);
-    geom->addRow("Detector tilt", tilt);
-    geom->addRow("", polarization);
+    geom->addRow("Beam origin [px]", beam);
+    geom->addRow("Detector tilt [°]", tilt);
+    geom->addRow(polarization);
 
     for (auto *f : {energy_, distance_, beamX_, beamY_, rot1_, rot2_, polarization_})
         connect(f, &NumberLineEdit::newValue, this, [this] { EmitExperiment(); });
@@ -222,16 +228,22 @@ QWidget *JFJochViewerSettingsDock::BuildMXPage() {
     auto *cell = new QFormLayout();
     cell->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
     cellKnown_ = new QCheckBox("Known unit cell", page);
-    cell->addRow("", cellKnown_);
-    cellA_ = new NumberLineEdit(1.0, 2000.0, 79.0, 3, "Å", page);
-    cellB_ = new NumberLineEdit(1.0, 2000.0, 79.0, 3, "Å", page);
-    cellC_ = new NumberLineEdit(1.0, 2000.0, 38.0, 3, "Å", page);
-    cellAlpha_ = new NumberLineEdit(1.0, 179.0, 90.0, 2, "°", page);
-    cellBeta_ = new NumberLineEdit(1.0, 179.0, 90.0, 2, "°", page);
-    cellGamma_ = new NumberLineEdit(1.0, 179.0, 90.0, 2, "°", page);
+    cell->addRow(cellKnown_);
+    cellA_ = new NumberLineEdit(1.0, 2000.0, 79.0, 3, "", page);
+    cellB_ = new NumberLineEdit(1.0, 2000.0, 79.0, 3, "", page);
+    cellC_ = new NumberLineEdit(1.0, 2000.0, 38.0, 3, "", page);
+    cellAlpha_ = new NumberLineEdit(1.0, 179.0, 90.0, 2, "", page);
+    cellBeta_ = new NumberLineEdit(1.0, 179.0, 90.0, 2, "", page);
+    cellGamma_ = new NumberLineEdit(1.0, 179.0, 90.0, 2, "", page);
     spaceGroup_ = new NumberLineEdit(0.0, 230.0, 0.0, 0, "", page);
     spaceGroup_->setToolTip("Space group number (1–230); 0 = unset.");
     spaceGroupName_ = new QLabel("—", page);
+    // Three fields to a row, and a cell length can be four digits: let the row divide the width it
+    // has instead of each field demanding the width of its longest possible value, which is what
+    // made this the one section that still pushed the dock wider than it is.
+    for (auto *f : {cellA_, cellB_, cellC_, cellAlpha_, cellBeta_, cellGamma_})
+        f->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
+
     auto *abc = new QHBoxLayout();
     abc->addWidget(cellA_); abc->addWidget(cellB_); abc->addWidget(cellC_);
     auto *angles = new QHBoxLayout();
@@ -240,8 +252,8 @@ QWidget *JFJochViewerSettingsDock::BuildMXPage() {
     auto *sgRow = new QHBoxLayout();
     sgRow->addWidget(spaceGroup_, 1);
     sgRow->addWidget(spaceGroupName_, 1);
-    cell->addRow("a, b, c", abc);
-    cell->addRow("α, β, γ", angles);
+    cell->addRow("a, b, c [Å]", abc);
+    cell->addRow("α, β, γ [°]", angles);
     cell->addRow("Space group", sgRow);
     cellSection->setContentLayout(cell);
     layout->addWidget(cellSection);
@@ -298,12 +310,12 @@ QWidget *JFJochViewerSettingsDock::BuildMXPage() {
     // the value rejected further down.
     auto *maxSpots = new NumberLineEdit(10.0f, static_cast<float>(MAX_SPOT_COUNT),
                                         static_cast<float>(max_spots_), 0, "", page);
-    spot->addRow("", adaptive);
+    spot->addRow(adaptive);
     spot->addRow("Signal/noise", snr);
     spot->addRow("Photon count", count);
-    spot->addRow("", autoHighResSpot);
+    spot->addRow(autoHighResSpot);
     spot->addRow("High resolution [Å]", highResSpot);
-    spot->addRow("", adaptiveMinPix);
+    spot->addRow(adaptiveMinPix);
     spot->addRow("Min pixels/spot", minPix);
     spot->addRow("Max spots/image", maxSpots);
     spotSection->setContentLayout(spot);
@@ -355,6 +367,10 @@ QWidget *JFJochViewerSettingsDock::BuildMXPage() {
     auto *idx = new QFormLayout();
     idx->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
     algo_ = new QComboBox(page);
+    // As in the calibrant combo: a combo is otherwise never narrower than its longest entry, which
+    // for these descriptions is wider than the dock. The current entry elides instead.
+    algo_->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
+    algo_->setMinimumContentsLength(12);
     algo_->addItem("Auto", static_cast<int>(IndexingAlgorithmEnum::Auto));
     algo_->addItem("FFBIDX (GPU, known cell)", static_cast<int>(IndexingAlgorithmEnum::FFBIDX));
     algo_->addItem("FFT (GPU, de-novo)", static_cast<int>(IndexingAlgorithmEnum::FFT));
@@ -365,6 +381,8 @@ QWidget *JFJochViewerSettingsDock::BuildMXPage() {
     algoDesc_->setWordWrap(true);
     algoDesc_->setStyleSheet("color: gray;");
     auto *refine = new QComboBox(page);
+    refine->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
+    refine->setMinimumContentsLength(12);
     refine->addItem("None", static_cast<int>(GeomRefinementAlgorithmEnum::None));
     refine->addItem("Orientation only", static_cast<int>(GeomRefinementAlgorithmEnum::OrientationOnly));
     refine->addItem("Beam center + lattice", static_cast<int>(GeomRefinementAlgorithmEnum::BeamCenter));
@@ -374,7 +392,7 @@ QWidget *JFJochViewerSettingsDock::BuildMXPage() {
     refine->addItem("Flex (best per-image refinement)", static_cast<int>(GeomRefinementAlgorithmEnum::Flex));
     refine->setCurrentIndex(refine->findData(static_cast<int>(indexing_.GetGeomRefinementAlgorithm())));
     idx->addRow("Algorithm", algo_);
-    idx->addRow("", algoDesc_);
+    idx->addRow(algoDesc_);
     idx->addRow("Refinement", refine);
     idxSection->setContentLayout(idx);
     layout->addWidget(idxSection);
@@ -442,8 +460,8 @@ QWidget *JFJochViewerSettingsDock::BuildGoniometerSection() {
     gridNFast_ = new NumberLineEdit(1.0, 100000.0, DEFAULT_GRID_N_FAST, 0, "", this);
     gridNFast_->setToolTip("Points along the fast axis. The number of slow rows follows from the "
                            "number of images.");
-    gridStepX_ = new NumberLineEdit(-10000.0, 10000.0, DEFAULT_GRID_STEP_UM, 1, "μm", this);
-    gridStepY_ = new NumberLineEdit(-10000.0, 10000.0, DEFAULT_GRID_STEP_UM, 1, "μm", this);
+    gridStepX_ = new NumberLineEdit(-10000.0, 10000.0, DEFAULT_GRID_STEP_UM, 1, "", this);
+    gridStepY_ = new NumberLineEdit(-10000.0, 10000.0, DEFAULT_GRID_STEP_UM, 1, "", this);
     const QString stepTip = "Distance between neighbouring points, in x and y. Negative = the scan "
                             "runs towards decreasing x / y.";
     gridStepX_->setToolTip(stepTip);
@@ -464,17 +482,17 @@ QWidget *JFJochViewerSettingsDock::BuildGoniometerSection() {
     auto *gridFlags = new QHBoxLayout();
     gridFlags->addWidget(gridVertical_); gridFlags->addWidget(gridSnake_);
 
-    form->addRow("", modeStill_);
-    form->addRow("", modeRotation_);
+    form->addRow(modeStill_);
+    form->addRow(modeRotation_);
     form->addRow("Axis name", axisName_);
     form->addRow("Axis vector", axis);
     form->addRow("Start angle", rotStart_);
     form->addRow("Increment", rotIncrement_);
-    form->addRow("", modeGrid_);
+    form->addRow(modeGrid_);
     form->addRow("Points (fast)", gridNFast_);
-    form->addRow("Step x, y", step);
-    form->addRow("", gridFlags);
-    form->addRow("", gridSummary_);
+    form->addRow("Step x, y [μm]", step);
+    form->addRow(gridFlags);
+    form->addRow(gridSummary_);
     section->setContentLayout(form);
 
     EnableRotationFields(false);   // datasetLoaded picks the mode the file describes
@@ -621,7 +639,7 @@ QWidget *JFJochViewerSettingsDock::BuildAzIntSection() {
         azimBins->addItem(QString::number(b), b);
     azimBins->setCurrentIndex(azimBins->findData(azint_.GetAzimuthalBinCount()));
     az->addRow("Low Q [Å⁻¹]", lowQ);
-    az->addRow("", autoHighQ);
+    az->addRow(autoHighQ);
     az->addRow("High Q [Å⁻¹]", highQ);
     az->addRow("Q spacing [Å⁻¹]", spacing);
     az->addRow("Azimuthal bins", azimBins);
@@ -737,9 +755,9 @@ QWidget *JFJochViewerSettingsDock::BuildBraggSection() {
     auto *gaussian = new QCheckBox("Gaussian profile fit", this);
     gaussian->setChecked(bragg_.GetIntegrator() != IntegratorMode::BoxSum);
     gaussian->setToolTip("Profile-fit the spots (more accurate intensities); off = classical box-sum.");
-    auto *r1 = new NumberLineEdit(1.0f, 30.0f, bragg_.GetR1(), 1, "px", this);
-    auto *r2 = new NumberLineEdit(1.0f, 30.0f, bragg_.GetR2(), 1, "px", this);
-    auto *r3 = new NumberLineEdit(1.0f, 30.0f, bragg_.GetR3(), 1, "px", this);
+    auto *r1 = new NumberLineEdit(1.0f, 30.0f, bragg_.GetR1(), 1, "", this);
+    auto *r2 = new NumberLineEdit(1.0f, 30.0f, bragg_.GetR2(), 1, "", this);
+    auto *r3 = new NumberLineEdit(1.0f, 30.0f, bragg_.GetR3(), 1, "", this);
     auto *radii = new QHBoxLayout();
     radii->addWidget(r1); radii->addWidget(r2); radii->addWidget(r3);
     // Background trim: use the old symmetric trimmed mean for the r2..r3 ring (drop the lowest and
@@ -757,9 +775,9 @@ QWidget *JFJochViewerSettingsDock::BuildBraggSection() {
     auto *trimRow = new QHBoxLayout();
     trimRow->addWidget(bkgTrim);
     trimRow->addWidget(bkgTrimFrac, 1);
-    form->addRow("", gaussian);
-    form->addRow("Radii r1/r2/r3", radii);
-    form->addRow("", trimRow);
+    form->addRow(gaussian);
+    form->addRow("Radii r1/r2/r3 [px]", radii);
+    form->addRow(trimRow);
     section->setContentLayout(form);
 
     auto emitBragg = [=, this] {
@@ -814,19 +832,19 @@ QWidget *JFJochViewerSettingsDock::BuildScalingSection() {
     auto *lowRes = new NumberLineEdit(5.0f, 500.0f, scaling_.GetLowResolutionLimit_A().value_or(50.0), 1, "Å", this);
     lowRes->setEnabled(limitLowRes->isChecked());
 
-    form->addRow("", friedel);
-    form->addRow("", corrections);
-    form->addRow("", partRefine);
+    form->addRow(friedel);
+    form->addRow(corrections);
+    form->addRow(partRefine);
     // Compact, and aligned with the checkboxes above: the limit checkbox + value sit together in the
     // field column (not as a row label, which would indent it differently).
     auto *resRow = new QHBoxLayout();
     resRow->addWidget(limitRes);
     resRow->addWidget(highRes, 1);
-    form->addRow("", resRow);
+    form->addRow(resRow);
     auto *lowResRow = new QHBoxLayout();
     lowResRow->addWidget(limitLowRes);
     lowResRow->addWidget(lowRes, 1);
-    form->addRow("", lowResRow);
+    form->addRow(lowResRow);
     section->setContentLayout(form);
 
     auto emitScaling = [=, this] {
diff --git a/viewer/widgets/JFJochViewerSidePanelChart.cpp b/viewer/widgets/JFJochViewerSidePanelChart.cpp
index a4cb3c795..e7ace480f 100644
--- a/viewer/widgets/JFJochViewerSidePanelChart.cpp
+++ b/viewer/widgets/JFJochViewerSidePanelChart.cpp
@@ -23,7 +23,6 @@ QList<QPair<QString, int>> JFJochViewerSidePanelChart::PlotTypes() {
         {"I/sigma", 2},
         {"Spots (count)", 5},
         {"Spots (intensity)", 6},
-        {"X-ray fluorescence spectrum", 4},
     };
 }
 
@@ -53,13 +52,6 @@ void JFJochViewerSidePanelChart::redrawPlot() {
             y = image->ImageData().integration_Isigma;
             azint_plot->UpdateData(x, y, "d [Å]", "I/sigma", true);
             break;
-        case 4:
-            x = image->Dataset().experiment.GetFluorescenceSpectrum().GetEnergy_eV();
-            y = image->Dataset().experiment.GetFluorescenceSpectrum().GetData();
-            for (auto &iter: x)
-                iter /= 1000.0; // Convert eV to keV
-            azint_plot->UpdateData(x, y, "E [keV]", "", false);
-            break;
         case 5:
             x = image->ImageData().spot_plot_one_over_d_square;
             y = image->ImageData().spot_plot_count;
diff --git a/viewer/widgets/JFJochViewerSidePanelChart.h b/viewer/widgets/JFJochViewerSidePanelChart.h
index 74141bd29..61d736b62 100644
--- a/viewer/widgets/JFJochViewerSidePanelChart.h
+++ b/viewer/widgets/JFJochViewerSidePanelChart.h
@@ -11,7 +11,7 @@
 #include "../../reader/JFJochReaderImage.h"
 #include "../charts/JFJochSimpleChartView.h"
 
-// Per-image profile plot (azimuthal 1D, Wilson, I/sigma, spots, fluorescence). It has no selector
+// Per-image profile plot (azimuthal 1D, Wilson, I/sigma, spots). It has no selector
 // of its own — the host (dataset-info dock) drives the plot type via setPlotType, reusing its one
 // combo box.
 class JFJochViewerSidePanelChart : public QWidget {
diff --git a/viewer/widgets/PowderCalibrationWidget.cpp b/viewer/widgets/PowderCalibrationWidget.cpp
index e1d11a4d2..d40f4aeec 100644
--- a/viewer/widgets/PowderCalibrationWidget.cpp
+++ b/viewer/widgets/PowderCalibrationWidget.cpp
@@ -14,11 +14,18 @@ PowderCalibrationWidget::PowderCalibrationWidget(QWidget *parent) : QWidget(pare
     auto layout = new QVBoxLayout(this);
 
     calibrantCombo = new QComboBox(this);
+    // Without this a combo asks to be as wide as its longest entry - and it is never allowed to
+    // shrink below that, which is what used to pin the whole settings dock wide as soon as the
+    // powder section was expanded. The current text elides instead; the tooltip carries the rest.
+    calibrantCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
+    calibrantCombo->setMinimumContentsLength(12);
     updateCalibrantList();
 
     // How a whole-dataset run measures the rings. The two buttons below always work from the spots of
     // the image on screen, so this only takes effect for "Analyze dataset".
     methodCombo = new QComboBox(this);
+    methodCombo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon);
+    methodCombo->setMinimumContentsLength(12);
     methodCombo->addItem("Rings (summed profile)", static_cast<int>(CalibrationMethod::Rings));
     methodCombo->addItem("Spots (pooled spot lists)", static_cast<int>(CalibrationMethod::Spots));
     methodCombo->setToolTip("How \"Analyze dataset\" measures the powder rings: rings sums the "
@@ -49,19 +56,20 @@ PowderCalibrationWidget::PowderCalibrationWidget(QWidget *parent) : QWidget(pare
         emit ringsFromCalibration(d_rings);
     });
 
+    // One button per row rather than two side by side: the panel lives in a narrow left-hand dock,
+    // and two buttons abreast cannot be narrower than the sum of their two labels.
     auto refine_row = new QGridLayout();
     refine_row->setSpacing(12);
     refine_row->addWidget(new QLabel("Calibrant:"),0,0);
     refine_row->addWidget(calibrantCombo,0,1);
-    refine_row->addWidget(findBeamCenterButton,1, 0);
-    refine_row->addWidget(optimizeBeamCenterButton,1, 1);
 
-    refine_row->addWidget(calibrantRingsButton,2, 0);
+    refine_row->addWidget(new QLabel("Dataset method:"),1,0);
+    refine_row->addWidget(methodCombo,1,1);
 
-    refine_row->addWidget(refineTiltCheck,2, 1);
-
-    refine_row->addWidget(new QLabel("Dataset method:"),3,0);
-    refine_row->addWidget(methodCombo,3,1);
+    refine_row->addWidget(findBeamCenterButton,2, 0, 1, 2);
+    refine_row->addWidget(optimizeBeamCenterButton,3, 0, 1, 2);
+    refine_row->addWidget(calibrantRingsButton,4, 0, 1, 2);
+    refine_row->addWidget(refineTiltCheck,5, 0, 1, 2);
 
     auto hint = new QLabel("The two buttons fit the image on screen; \"Analyze dataset\" fits the whole "
                            "run and writes a .poni.", this);
@@ -103,14 +111,19 @@ void PowderCalibrationWidget::updateCalibrantList() {
 
     for (const auto &c : Calibrants())
         calibrantCombo->addItem(QString::fromStdString(c.name));
-    if (sample_cell)
-        calibrantCombo->addItem(QString("Current sample (%1 %2 %3 %4 %5 %6)")
-            .arg(QString::number(sample_cell->a, 'f', 1))
-            .arg(QString::number(sample_cell->b, 'f', 1))
-            .arg(QString::number(sample_cell->c, 'f', 1))
-            .arg(QString::number(sample_cell->alpha, 'f', 1))
-            .arg(QString::number(sample_cell->beta, 'f', 1))
-            .arg(QString::number(sample_cell->gamma, 'f', 1)));
+    if (sample_cell) {
+        // The cell goes in the tooltip, not in the entry: a 40-character item would set the combo's
+        // minimum width and, through it, the minimum width of the dock this widget sits in.
+        calibrantCombo->addItem("Current sample cell");
+        calibrantCombo->setItemData(calibrantCombo->count() - 1,
+            QString("%1 %2 %3 %4 %5 %6")
+                .arg(QString::number(sample_cell->a, 'f', 1))
+                .arg(QString::number(sample_cell->b, 'f', 1))
+                .arg(QString::number(sample_cell->c, 'f', 1))
+                .arg(QString::number(sample_cell->alpha, 'f', 1))
+                .arg(QString::number(sample_cell->beta, 'f', 1))
+                .arg(QString::number(sample_cell->gamma, 'f', 1)), Qt::ToolTipRole);
+    }
     calibrantCombo->setCurrentIndex(0);
 }
 
diff --git a/viewer/widgets/SliderPlusBox.cpp b/viewer/widgets/SliderPlusBox.cpp
index ce117eb0e..ab4571b3f 100644
--- a/viewer/widgets/SliderPlusBox.cpp
+++ b/viewer/widgets/SliderPlusBox.cpp
@@ -10,9 +10,11 @@ SliderPlusBox::SliderPlusBox(double min, double max, double step, int decimals,
         throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
                               "Scale factor for SliderPlusBox must be positive");
 
-    if (m_scaleType == Logarithmic && m_min <= 0)
+    // A logarithmic scale accepts a minimum of exactly zero: slider position 0 means 0 ("off"),
+    // and the rest of the track spans [1, max] logarithmically.
+    if (m_scaleType == Logarithmic && m_min < 0)
         throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
-                              "Minimum value must be greater than zero for logarithmic scale");
+                              "Minimum value must not be negative for logarithmic scale");
 
     if (m_max <= m_min)
         throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
@@ -89,8 +91,11 @@ double SliderPlusBox::sliderToValue(int sliderValue) const {
     if (m_scaleType == Linear) {
         return sliderValue * m_step;
     } else {  // Logarithmic
+        const double lo = (m_min > 0.0) ? m_min : 1.0;
+        if (m_min <= 0.0 && sliderValue <= 0)
+            return 0.0;
         // Map from slider position (0-1000) to logarithmic value range
-        double logMin = std::log10(m_min);
+        double logMin = std::log10(lo);
         double logMax = std::log10(m_max);
         double normalizedPos = static_cast<double>(sliderValue) / 1000.0;
         double logValue = logMin + normalizedPos * (logMax - logMin);
@@ -102,10 +107,13 @@ int SliderPlusBox::valueToSlider(double value) const {
     if (m_scaleType == Linear) {
         return static_cast<int>(value / m_step);
     } else {  // Logarithmic
+        const double lo = (m_min > 0.0) ? m_min : 1.0;
+        if (m_min <= 0.0 && value < lo)
+            return 0;
         // Map from value to slider position (0-1000)
-        double logMin = std::log10(m_min);
+        double logMin = std::log10(lo);
         double logMax = std::log10(m_max);
-        double logValue = std::log10(std::max(value, m_min));  // Ensure we don't go below min
+        double logValue = std::log10(std::max(value, lo));  // Ensure we don't go below min
         double normalizedPos = (logValue - logMin) / (logMax - logMin);
         return static_cast<int>(normalizedPos * 1000.0);
     }
@@ -137,8 +145,8 @@ void SliderPlusBox::setScaleType(ScaleType type) {
     if (m_scaleType == type)
         return;
 
-    if (type == Logarithmic && m_min <= 0) {
-        qWarning() << "Cannot switch to logarithmic scale with min <= 0";
+    if (type == Logarithmic && m_min < 0) {
+        qWarning() << "Cannot switch to logarithmic scale with min < 0";
         return;
     }
 
diff --git a/viewer/windows/JFJochCalibrationResultWindow.cpp b/viewer/windows/JFJochCalibrationResultWindow.cpp
index 984532303..33f042077 100644
--- a/viewer/windows/JFJochCalibrationResultWindow.cpp
+++ b/viewer/windows/JFJochCalibrationResultWindow.cpp
@@ -59,21 +59,29 @@ JFJochCalibrationResultWindow::JFJochCalibrationResultWindow(const QString &titl
     hero->addWidget(MakeCard(QString::number(calibration.ring_points), "Ring points", this));
     layout->addLayout(hero);
 
-    auto *table = new QTableWidget(6, 4, this);
+    auto *table = new QTableWidget(7, 4, this);
     table->setHorizontalHeaderLabels({"Quantity", "Fitted", "From header", "Change"});
     table->setEditTriggers(QAbstractItemView::NoEditTriggers);
     table->verticalHeader()->setVisible(false);
     table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
 
+    // The PONI is the point of normal incidence, which is what the .poni file stores; the direct beam
+    // is where the beam actually lands, which is what every other program calls the beam centre. They
+    // part company by distance*tan(rot) as soon as the detector is tilted, so show both.
+    const auto [beam_x, beam_y] = g.GetDirectBeam_pxl();
+    const auto [header_beam_x, header_beam_y] = header.GetDirectBeam_pxl();
+
     const struct { QString name; double fitted; double header; int digits; } rows[] = {
-        {"PONI x [px]",   g.GetBeamX_pxl(),                 header.GetBeamX_pxl(),                 3},
-        {"PONI y [px]",   g.GetBeamY_pxl(),                 header.GetBeamY_pxl(),                 3},
-        {"Rot1 [°]",      g.GetPoniRot1_rad() * RAD_TO_DEG, header.GetPoniRot1_rad() * RAD_TO_DEG, 4},
-        {"Rot2 [°]",      g.GetPoniRot2_rad() * RAD_TO_DEG, header.GetPoniRot2_rad() * RAD_TO_DEG, 4},
-        {"Distance [mm]", g.GetDetectorDistance_mm(),       header.GetDetectorDistance_mm(),       4},
+        {"PONI x [px]",        g.GetBeamX_pxl(),                 header.GetBeamX_pxl(),                 3},
+        {"PONI y [px]",        g.GetBeamY_pxl(),                 header.GetBeamY_pxl(),                 3},
+        {"Rot1 [°]",           g.GetPoniRot1_rad() * RAD_TO_DEG, header.GetPoniRot1_rad() * RAD_TO_DEG, 4},
+        {"Rot2 [°]",           g.GetPoniRot2_rad() * RAD_TO_DEG, header.GetPoniRot2_rad() * RAD_TO_DEG, 4},
+        {"Distance [mm]",      g.GetDetectorDistance_mm(),       header.GetDetectorDistance_mm(),       4},
+        {"Direct beam x [px]", beam_x,                           header_beam_x,                         3},
+        {"Direct beam y [px]", beam_y,                           header_beam_y,                         3},
     };
 
-    for (int i = 0; i < 5; i++) {
+    for (int i = 0; i < 7; i++) {
         const double change = rows[i].fitted - rows[i].header;
         table->setItem(i, 0, new QTableWidgetItem(rows[i].name));
         table->setItem(i, 1, new QTableWidgetItem(QString::number(rows[i].fitted, 'f', rows[i].digits)));
@@ -81,16 +89,6 @@ JFJochCalibrationResultWindow::JFJochCalibrationResultWindow(const QString &titl
         table->setItem(i, 3, new QTableWidgetItem(
             QStringLiteral("%1%2").arg(change >= 0 ? "+" : "").arg(change, 0, 'f', rows[i].digits)));
     }
-
-    // The PONI is the point of normal incidence, which is what the .poni file stores; the direct beam
-    // is where the beam actually lands, which is what every other program calls the beam centre. They
-    // part company by distance*tan(rot) as soon as the detector is tilted, so show both.
-    const auto [beam_x, beam_y] = g.GetDirectBeam_pxl();
-    table->setItem(5, 0, new QTableWidgetItem("Direct beam [px]"));
-    table->setItem(5, 1, new QTableWidgetItem(QStringLiteral("%1, %2")
-                                                  .arg(beam_x, 0, 'f', 3).arg(beam_y, 0, 'f', 3)));
-    table->setItem(5, 2, new QTableWidgetItem("—"));
-    table->setItem(5, 3, new QTableWidgetItem("—"));
     layout->addWidget(table);
 
     auto *note = new QLabel(this);
diff --git a/viewer/windows/JFJochMergeStatsWindow.cpp b/viewer/windows/JFJochMergeStatsWindow.cpp
index 8e77a26ac..c6260e622 100644
--- a/viewer/windows/JFJochMergeStatsWindow.cpp
+++ b/viewer/windows/JFJochMergeStatsWindow.cpp
@@ -8,8 +8,10 @@
 
 #include <QButtonGroup>
 #include <QComboBox>
+#include <QFontDatabase>
 #include <QFrame>
 #include <QHBoxLayout>
+#include <QPlainTextEdit>
 #include <QHeaderView>
 #include <QLabel>
 #include <QStackedWidget>
@@ -72,6 +74,7 @@ JFJochMergeStatsWindow::JFJochMergeStatsWindow(const QString &title, const Merge
                                                const std::optional<gemmi::SpaceGroup> &space_group,
                                                const std::optional<SearchSpaceGroupResult> &space_group_search,
                                                const std::vector<std::pair<float, float>> &merged_i_sigma,
+                                               const QString &report,
                                                QWidget *parent)
     : QWidget(parent, Qt::Window), stats_(stats), has_reference_(has_reference) {
     setWindowTitle("Merge statistics — " + title);
@@ -195,14 +198,21 @@ JFJochMergeStatsWindow::JFJochMergeStatsWindow(const QString &title, const Merge
     isaBtn->setCheckable(true);
     isaBtn->setToolTip("ISa diagnostic: merged I/σ against I");
     isaBtn->setStyleSheet(ToolbarIcons::buttonStyle());
+    auto *reportBtn = new QToolButton(this);
+    reportBtn->setText("Report");
+    reportBtn->setCheckable(true);
+    reportBtn->setToolTip("The rugnux result report, as written to <prefix>_report.txt");
+    reportBtn->setStyleSheet(ToolbarIcons::buttonStyle());
     auto *viewGroup = new QButtonGroup(this);
     viewGroup->setExclusive(true);
     viewGroup->addButton(plotBtn, 0);
     viewGroup->addButton(tableBtn, 1);
     viewGroup->addButton(isaBtn, 2);
+    viewGroup->addButton(reportBtn, 3);
     row->addWidget(plotBtn);
     row->addWidget(tableBtn);
     row->addWidget(isaBtn);
+    row->addWidget(reportBtn);
     row->addSpacing(12);
     metricLabel_ = new QLabel("Metric:", this);
     row->addWidget(metricLabel_);
@@ -231,11 +241,28 @@ JFJochMergeStatsWindow::JFJochMergeStatsWindow(const QString &title, const Merge
         stack_->addWidget(isa_page_);   // page 2
     else
         isaBtn->setEnabled(false);
+    // The report is prose and fixed-width tables meant to be read as written - a plain text view
+    // in a fixed-width font, never wrapped.
+    if (!report.isEmpty()) {
+        auto *report_view = new QPlainTextEdit(this);
+        report_view->setReadOnly(true);
+        report_view->setLineWrapMode(QPlainTextEdit::NoWrap);
+        report_view->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
+        report_view->setPlainText(report);
+        report_page_ = report_view;
+        stack_->addWidget(report_page_);
+    } else {
+        reportBtn->setEnabled(false);
+    }
     layout->addWidget(stack_, 1);
 
     connect(metric_, &QComboBox::currentIndexChanged, this, [this](int) { updatePlot(); });
+    // Button ids map to page widgets, not stack indices: an absent page (no ISa scatter, no
+    // report) would otherwise shift every page behind it.
     connect(viewGroup, &QButtonGroup::idClicked, this, [this](int idx) {
-        stack_->setCurrentIndex(idx);
+        QWidget *const pages[] = {chart_, table_, isa_page_, report_page_};
+        if (idx >= 0 && idx < 4 && pages[idx])
+            stack_->setCurrentWidget(pages[idx]);
         metric_->setVisible(idx == 0);        // the metric selector + its label only apply to the plot
         metricLabel_->setVisible(idx == 0);
     });
diff --git a/viewer/windows/JFJochMergeStatsWindow.h b/viewer/windows/JFJochMergeStatsWindow.h
index e8402121b..199fb3169 100644
--- a/viewer/windows/JFJochMergeStatsWindow.h
+++ b/viewer/windows/JFJochMergeStatsWindow.h
@@ -28,12 +28,14 @@ class JFJochSimpleChartView;
 class JFJochMergeStatsWindow : public QWidget {
     Q_OBJECT
 public:
+    // `report` is the rugnux result report text (<prefix>_report.txt), shown as its own view.
     JFJochMergeStatsWindow(const QString &title, const MergeStatistics &stats,
                            double isa, bool has_reference,
                            const TwinningAnalysisResult &twinning,
                            const std::optional<gemmi::SpaceGroup> &space_group,
                            const std::optional<SearchSpaceGroupResult> &space_group_search,
                            const std::vector<std::pair<float, float>> &merged_i_sigma,
+                           const QString &report,
                            QWidget *parent = nullptr);
 
 private:
@@ -41,10 +43,11 @@ private:
     bool has_reference_;
     QComboBox *metric_ = nullptr;
     QLabel *metricLabel_ = nullptr;      // "Metric:" — hidden in table view
-    QStackedWidget *stack_ = nullptr;    // page 0: plot, page 1: table, page 2: ISa diagnostic
+    QStackedWidget *stack_ = nullptr;    // page 0: plot, page 1: table, page 2: ISa, page 3: report
     JFJochSimpleChartView *chart_ = nullptr;
     QTableWidget *table_ = nullptr;
     QWidget *isa_page_ = nullptr;
+    QWidget *report_page_ = nullptr;
 
     void updatePlot();
     void buildTable();
diff --git a/viewer/windows/JFJochMouseShortcutsWindow.cpp b/viewer/windows/JFJochMouseShortcutsWindow.cpp
index 5793ec891..3541d4a8d 100644
--- a/viewer/windows/JFJochMouseShortcutsWindow.cpp
+++ b/viewer/windows/JFJochMouseShortcutsWindow.cpp
@@ -17,9 +17,10 @@ namespace {
                 {"Wheel",                     "Zoom in / out, centred on the cursor"},
                 {"Shift + wheel",             "Move the foreground (upper contrast limit) in linear steps"},
                 {"Ctrl + wheel",              "Move the foreground in multiplicative steps (&times;1.15 per notch)"},
-                {"Alt + wheel",               "Step through the dataset, one image per notch (up = next image)"},
                 {"F held + wheel",            "Same as Shift + wheel, for as long as F is held"},
-                {"A",                         "Switch on the automatic foreground"},
+                {"A",                         "Apply auto-contrast once; press again to switch on continuous Auto"},
+                {"Home / End",                "Jump to the first / last image in the dataset"},
+                {"Page Up / Page Down",       "Step one image forward / back"},
                 {"Hover",                     "Status bar shows the pixel position, its value and the resolution"},
                 {"Drag",                      "Pan the image"},
                 {"Shift + drag",              "Draw a rectangular ROI"},
@@ -39,10 +40,6 @@ namespace {
                 {"Dataset-info plot: Shift + hover",     "Load the hovered image"},
                 {"Spot / reflection list: double click", "Zoom the diffraction image on that spot or prediction"},
                 {"Image list: double click",             "Load that image"},
-                {"Reciprocal space: drag",               "Rotate the view"},
-                {"Reciprocal space: right drag",         "Pan the view"},
-                {"Reciprocal space: wheel",              "Zoom the view"},
-                {"Reciprocal space: double click",       "Zoom the diffraction image on the nearest spot"},
                 {"Magnifier: wheel",                     "Zoom the magnifier; it follows the cursor on the main image"},
             }},
         };
@@ -55,9 +52,6 @@ namespace {
                 html += "<tr><td width='38%'><b>" + row.action + "</b></td><td>" + row.effect + "</td></tr>";
             html += "</table>";
         }
-        html += "<p><i>Note:</i> some window managers take Alt-modified mouse events for themselves "
-                "before the application sees them. That is a window-manager setting, not something "
-                "the viewer can take back.</p>";
         html += "</body></html>";
         return html;
     }
diff --git a/viewer/windows/JFJochProcessingJobsWindow.cpp b/viewer/windows/JFJochProcessingJobsWindow.cpp
index 2c7e0cb44..4f7d872b1 100644
--- a/viewer/windows/JFJochProcessingJobsWindow.cpp
+++ b/viewer/windows/JFJochProcessingJobsWindow.cpp
@@ -72,7 +72,7 @@ namespace {
 
 JFJochProcessingJobsWindow::JFJochProcessingJobsWindow(JFJochImageReadingWorker *worker, QWidget *parent)
     : QWidget(parent), worker_(worker) {
-    setWindowTitle("Processing");
+    setWindowTitle("Jobs");
 
     controller_ = new JFJochProcessController(this);
     connect(controller_, &JFJochProcessController::phaseChanged, this, &JFJochProcessingJobsWindow::onPhase);
@@ -592,7 +592,7 @@ void JFJochProcessingJobsWindow::showStats(const QString &id) {
         if (j.id == id && j.has_merge_stats) {
             auto *win = new JFJochMergeStatsWindow(j.label, j.merge_stats, j.isa, j.merge_has_reference,
                                                    j.twinning, j.space_group, j.space_group_search,
-                                                   j.merged_i_sigma, window());
+                                                   j.merged_i_sigma, j.report, window());
             win->show();
             return;
         }
@@ -712,7 +712,7 @@ void JFJochProcessingJobsWindow::onProgress(quint64 done, quint64 total) {
     }
 }
 
-void JFJochProcessingJobsWindow::onFinished(ProcessResult result) {
+void JFJochProcessingJobsWindow::onFinished(ProcessResult result, QString report) {
     emit liveDataset(nullptr);   // the finished run takes over from the live overlay
     const int row = running_row_;
     running_row_ = -1;
@@ -758,6 +758,7 @@ void JFJochProcessingJobsWindow::onFinished(ProcessResult result) {
     // row's graph icon).
     if (!result.cancelled && result.has_merge_statistics) {
         jobs_[row].has_merge_stats = true;
+        jobs_[row].report = report;
         jobs_[row].merge_stats = result.merge_statistics;
         jobs_[row].isa = result.error_model_isa;
         jobs_[row].merge_has_reference = result.has_reference;
diff --git a/viewer/windows/JFJochProcessingJobsWindow.h b/viewer/windows/JFJochProcessingJobsWindow.h
index 5d33fa5d3..08d8eb692 100644
--- a/viewer/windows/JFJochProcessingJobsWindow.h
+++ b/viewer/windows/JFJochProcessingJobsWindow.h
@@ -54,7 +54,7 @@ private slots:
     void viewResults();
     void onPhase(QString phase);
     void onProgress(quint64 done, quint64 total);
-    void onFinished(ProcessResult result);
+    void onFinished(ProcessResult result, QString report);
     void onFailed(QString error);
 
 private:
@@ -72,6 +72,7 @@ private:
         std::optional<gemmi::SpaceGroup> space_group;               // final space group (searched or fixed)
         std::optional<SearchSpaceGroupResult> space_group_search;   // ranked candidates, when a search ran
         std::vector<std::pair<float, float>> merged_i_sigma;        // ISa diagnostic scatter
+        QString report;                     // the rugnux result report text (a section of the window)
         // Detector calibration result (Calibration mode): the fit, the header geometry it is compared
         // against, and where the .poni was written.
         std::optional<CalibrationResult> calibration;
diff --git a/viewer/windows/JFJochViewerReciprocalSpaceWindow.cpp b/viewer/windows/JFJochViewerReciprocalSpaceWindow.cpp
deleted file mode 100644
index 1c9927966..000000000
--- a/viewer/windows/JFJochViewerReciprocalSpaceWindow.cpp
+++ /dev/null
@@ -1,808 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
-// SPDX-License-Identifier: GPL-3.0-only
-
-#include "JFJochViewerReciprocalSpaceWindow.h"
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QSurfaceFormat>
-#include <QPushButton>
-#include <QLabel>
-#include <QtMath>
-
-#include <algorithm>
-#include <cmath>
-#include <limits>
-
-#include "../../reader/JFJochReaderSpots.h"
-
-// ============================================================================
-//  Shaders
-// ============================================================================
-
-// One shader handles both spots (GL_POINTS) and lines (GL_LINES).
-// Per-vertex color comes straight from the VBO; MVP is a single uniform.
-
-static const char *kVertSrc = R"(
-    #version 330 core
-    layout(location = 0) in vec3 aPos;
-    layout(location = 1) in vec4 aColor;
-    out vec4 vColor;
-    uniform mat4 uMVP;
-    void main() {
-        vColor       = aColor;
-        gl_Position  = uMVP * vec4(aPos, 1.0);
-        gl_PointSize = 6.0;
-    }
-)";
-
-static const char *kFragSrc = R"(
-    #version 330 core
-    in  vec4 vColor;
-    out vec4 fragColor;
-    uniform bool uPointShape;
-    void main() {
-        if (uPointShape) {
-            // Discard corners to draw a circle instead of a square point.
-            vec2 c = gl_PointCoord - vec2(0.5);
-            if (dot(c, c) > 0.25) discard;
-        }
-        fragColor = vColor;
-    }
-)";
-
-// ============================================================================
-//  ReciprocalSpaceGLView
-// ============================================================================
-
-ReciprocalSpaceGLView::ReciprocalSpaceGLView(QWidget *parent)
-    : QOpenGLWidget(parent)
-    , spotsVBO_(QOpenGLBuffer::VertexBuffer)
-    , linesVBO_(QOpenGLBuffer::VertexBuffer)
-{
-    // Request OpenGL 3.3 Core Profile.
-    QSurfaceFormat fmt;
-    fmt.setVersion(3, 3);
-    fmt.setProfile(QSurfaceFormat::CoreProfile);
-    fmt.setDepthBufferSize(24);
-    setFormat(fmt);
-    setFocusPolicy(Qt::StrongFocus);
-}
-
-ReciprocalSpaceGLView::~ReciprocalSpaceGLView() {
-    makeCurrent();
-    spotsVAO_.destroy();
-    spotsVBO_.destroy();
-    linesVAO_.destroy();
-    linesVBO_.destroy();
-    doneCurrent();
-}
-
-void ReciprocalSpaceGLView::initializeGL() {
-    initializeOpenGLFunctions();
-
-    glClearColor(20.f / 255.f, 20.f / 255.f, 25.f / 255.f, 1.0f);
-    glEnable(GL_DEPTH_TEST);
-    glEnable(GL_PROGRAM_POINT_SIZE);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    shader_.addShaderFromSourceCode(QOpenGLShader::Vertex,   kVertSrc);
-    shader_.addShaderFromSourceCode(QOpenGLShader::Fragment, kFragSrc);
-    shader_.link();
-
-    // Create empty VAO/VBOs so they are valid before the first data arrives.
-    setupVAO(spotsVAO_, spotsVBO_);
-    setupVAO(linesVAO_, linesVBO_);
-
-    glReady_ = true;
-
-    uploadBuffer(spotsVBO_, spotsVAO_, pendingSpots_);
-    spotsCount_ = static_cast<int>(pendingSpots_.size());
-
-    uploadBuffer(linesVBO_, linesVAO_, pendingLines_);
-    linesCount_ = static_cast<int>(pendingLines_.size());
-}
-
-void ReciprocalSpaceGLView::resizeGL(int w, int h) {
-    const float aspect = float(w) / float(h ? h : 1);
-    const float halfHeight = zoom_;
-    const float halfWidth  = halfHeight * aspect;
-
-    proj_.setToIdentity();
-    proj_.ortho(-halfWidth, halfWidth,
-                -halfHeight, halfHeight,
-                -10000.0f, 10000.0f);
-}
-
-QMatrix4x4 ReciprocalSpaceGLView::currentViewMatrix() const {
-    QMatrix4x4 view;
-    view.translate(0, 0, -zoom_);
-    view.rotate(pitch_, 1, 0, 0);
-    view.rotate(yaw_,   0, 1, 0);
-    view.translate(-target_);
-    return view;
-}
-
-QMatrix4x4 ReciprocalSpaceGLView::currentMvpMatrix() const {
-    return proj_ * currentViewMatrix();
-}
-
-void ReciprocalSpaceGLView::paintGL() {
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    const QMatrix4x4 mvp = currentMvpMatrix();
-
-    shader_.bind();
-    shader_.setUniformValue("uMVP", mvp);
-
-    // Draw axes + cell vectors.
-    // Convention: first 6 line vertices are XYZ reference axes,
-    // remaining line vertices are reciprocal-cell vectors.
-    if (linesCount_ > 0) {
-        shader_.setUniformValue("uPointShape", false);
-        linesVAO_.bind();
-
-        const int axesVertexCount = std::min(linesCount_, 6);
-        if (axesVertexCount > 0) {
-            glLineWidth(1.0f);
-            glDrawArrays(GL_LINES, 0, axesVertexCount);
-        }
-
-        if (linesCount_ > axesVertexCount) {
-            // Note: on some OpenGL core-profile drivers wide lines may be clamped to 1 px.
-            glLineWidth(3.0f);
-            glDrawArrays(GL_LINES, axesVertexCount, linesCount_ - axesVertexCount);
-            glLineWidth(1.0f);
-        }
-
-        linesVAO_.release();
-    }
-
-    // Draw observed spots + predicted nodes + explicit 000 marker.
-    if (spotsCount_ > 0) {
-        shader_.setUniformValue("uPointShape", true);
-        spotsVAO_.bind();
-        glDrawArrays(GL_POINTS, 0, spotsCount_);
-        spotsVAO_.release();
-    }
-
-    shader_.release();
-}
-
-// ---------------------------------------------------------------------------
-
-void ReciprocalSpaceGLView::setSpots(const std::vector<Vertex> &spots) {
-    pendingSpots_ = spots;
-    spotsCount_ = static_cast<int>(pendingSpots_.size());
-
-    if (glReady_) {
-        makeCurrent();
-        uploadBuffer(spotsVBO_, spotsVAO_, pendingSpots_);
-        doneCurrent();
-    }
-
-    update();
-}
-
-void ReciprocalSpaceGLView::setLines(const std::vector<Vertex> &lines) {
-    pendingLines_ = lines;
-    linesCount_ = static_cast<int>(pendingLines_.size());
-
-    if (glReady_) {
-        makeCurrent();
-        uploadBuffer(linesVBO_, linesVAO_, pendingLines_);
-        doneCurrent();
-    }
-
-    update();
-}
-
-void ReciprocalSpaceGLView::resetTarget() {
-    target_ = QVector3D(0.0f, 0.0f, 0.0f);
-    update();
-}
-
-// ---------------------------------------------------------------------------
-
-void ReciprocalSpaceGLView::setupVAO(QOpenGLVertexArrayObject &vao,
-                                      QOpenGLBuffer &vbo) {
-    vao.create();
-    vao.bind();
-
-    vbo.create();
-    vbo.bind();
-
-    // location 0: position xyz
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0,
-                          3,
-                          GL_FLOAT,
-                          GL_FALSE,
-                          sizeof(Vertex),
-                          reinterpret_cast<void *>(offsetof(Vertex, x)));
-
-    // location 1: color rgba
-    glEnableVertexAttribArray(1);
-    glVertexAttribPointer(1,
-                          4,
-                          GL_FLOAT,
-                          GL_FALSE,
-                          sizeof(Vertex),
-                          reinterpret_cast<void *>(offsetof(Vertex, r)));
-
-    vbo.release();
-    vao.release();
-}
-
-void ReciprocalSpaceGLView::uploadBuffer(QOpenGLBuffer &vbo,
-                                          QOpenGLVertexArrayObject &vao,
-                                          const std::vector<Vertex> &data) {
-    vao.bind();
-    vbo.bind();
-
-    if (data.empty()) {
-        vbo.allocate(nullptr, 0);
-    } else {
-        vbo.allocate(data.data(),
-                     static_cast<int>(data.size() * sizeof(Vertex)));
-    }
-
-    vbo.release();
-    vao.release();
-}
-
-// ---------------------------------------------------------------------------
-// Mouse / wheel -> orbit camera + picking
-// ---------------------------------------------------------------------------
-
-void ReciprocalSpaceGLView::mousePressEvent(QMouseEvent *e) {
-    lastMousePos_ = e->pos();
-}
-
-void ReciprocalSpaceGLView::mouseDoubleClickEvent(QMouseEvent *e) {
-    if (e->button() == Qt::LeftButton && emitNearestSpot(e->pos())) {
-        e->accept();
-        return;
-    }
-
-    QOpenGLWidget::mouseDoubleClickEvent(e);
-}
-
-void ReciprocalSpaceGLView::mouseMoveEvent(QMouseEvent *e) {
-    const QPoint delta = e->pos() - lastMousePos_;
-    lastMousePos_ = e->pos();
-
-    if (e->buttons() & Qt::LeftButton) {
-        yaw_   += delta.x() * 0.5f;
-        pitch_ += delta.y() * 0.5f;
-        pitch_  = qBound(-89.0f, pitch_, 89.0f);
-        update();
-    } else if (e->buttons() & Qt::RightButton) {
-        const float panScale = zoom_ * 0.0015f;
-
-        QMatrix4x4 rot;
-        rot.rotate(pitch_, 1, 0, 0);
-        rot.rotate(yaw_,   0, 1, 0);
-
-        const QVector3D right = rot.inverted().mapVector(QVector3D(1, 0, 0));
-        const QVector3D up    = rot.inverted().mapVector(QVector3D(0, 1, 0));
-
-        target_ -= right * float(delta.x()) * panScale;
-        target_ += up    * float(delta.y()) * panScale;
-
-        update();
-    }
-}
-
-void ReciprocalSpaceGLView::wheelEvent(QWheelEvent *e) {
-    zoom_ *= (e->angleDelta().y() > 0) ? 0.9f : 1.1f;
-    zoom_  = qBound(1.0f, zoom_, 5000.0f);
-    resizeGL(width(), height());
-    update();
-}
-
-bool ReciprocalSpaceGLView::emitNearestSpot(const QPoint &screenPos) {
-    if (pendingSpots_.empty() || width() <= 0 || height() <= 0)
-        return false;
-
-    const QMatrix4x4 mvp = currentMvpMatrix();
-
-    float bestDist2 = std::numeric_limits<float>::max();
-    QPointF bestImagePos;
-    bool found = false;
-
-    for (const auto &v : pendingSpots_) {
-        if (v.pickable <= 0.5f)
-            continue;
-
-        const QVector4D clip = mvp * QVector4D(v.x, v.y, v.z, 1.0f);
-        if (clip.w() <= 0.0f)
-            continue;
-
-        const QVector3D ndc = clip.toVector3DAffine();
-        if (ndc.z() < -1.0f || ndc.z() > 1.0f)
-            continue;
-
-        const float sx = (ndc.x() * 0.5f + 0.5f) * float(width());
-        const float sy = (0.5f - ndc.y() * 0.5f) * float(height());
-
-        const float dx = sx - float(screenPos.x());
-        const float dy = sy - float(screenPos.y());
-        const float dist2 = dx * dx + dy * dy;
-
-        if (dist2 < bestDist2) {
-            bestDist2 = dist2;
-            bestImagePos = QPointF(v.image_x, v.image_y);
-            found = true;
-        }
-    }
-
-    // Roughly 15 px picking radius.
-    if (!found || bestDist2 > 15.0f * 15.0f)
-        return false;
-
-    emit spotDoubleClicked(bestImagePos);
-    return true;
-}
-
-// ============================================================================
-//  JFJochViewerReciprocalSpaceWindow
-// ============================================================================
-
-JFJochViewerReciprocalSpaceWindow::JFJochViewerReciprocalSpaceWindow(QWidget *parent)
-    : JFJochHelperWindow(parent) {
-     setWindowTitle("Reciprocal space");
-    resize(800, 800);
-
-    auto *central = new QWidget(this);
-    auto *layout  = new QVBoxLayout(central);
-
-    glView_ = new ReciprocalSpaceGLView(central);
-    glView_->setMinimumSize(400, 400);
-    layout->addWidget(glView_, 1);
-
-    auto *controls = new QHBoxLayout();
-
-    crystalFrameCheck = new QCheckBox("Crystal frame (angle = 0)", central);
-    crystalFrameCheck->setChecked(false);
-    crystalFrameCheck->setEnabled(false);
-
-    showCellCheck = new QCheckBox("Show reciprocal cell", central);
-    showCellCheck->setChecked(true);
-
-    showPredictedCheck = new QCheckBox("Show predicted reflections", central);
-    showPredictedCheck->setChecked(false);
-
-    strideCombo = new QComboBox(central);
-    strideCombo->addItem("1", 1);
-    strideCombo->addItem("2", 2);
-    strideCombo->addItem("5", 5);
-    strideCombo->addItem("10", 10);
-    strideCombo->addItem("100", 100);
-    strideCombo->setCurrentIndex(0);
-
-    auto *loadFullDatasetButton = new QPushButton("Load full dataset", central);
-    auto *loadCurrentImageButton = new QPushButton("Load only current image", central);
-    auto *centerOriginButton = new QPushButton("Center 000", central);
-
-    controls->addWidget(crystalFrameCheck);
-    controls->addWidget(showCellCheck);
-    controls->addWidget(showPredictedCheck);
-    controls->addSpacing(12);
-    controls->addWidget(new QLabel("Stride:", central));
-    controls->addWidget(strideCombo);
-    controls->addWidget(loadFullDatasetButton);
-    controls->addWidget(loadCurrentImageButton);
-    controls->addStretch(1);
-    controls->addWidget(centerOriginButton);
-
-    layout->addLayout(controls);
-    setCentralWidget(central);
-
-    connect(crystalFrameCheck, &QCheckBox::toggled,
-            this, &JFJochViewerReciprocalSpaceWindow::rebuildGL);
-    connect(showCellCheck, &QCheckBox::toggled,
-            this, &JFJochViewerReciprocalSpaceWindow::rebuildGL);
-    connect(showPredictedCheck, &QCheckBox::toggled,
-            this, &JFJochViewerReciprocalSpaceWindow::rebuildGL);
-
-    connect(loadFullDatasetButton, &QPushButton::clicked, this, [this] {
-        if (!current_dataset_)
-            return;
-
-        const int64_t nimages = current_dataset_->experiment.GetImageNum();
-        if (nimages <= 0)
-            return;
-
-        const int64_t stride = strideCombo ? strideCombo->currentData().toLongLong() : 1;
-
-        full_dataset_mode_ = true;
-        emit loadSpotsRequest(0, nimages - 1, stride);
-    });
-
-    connect(loadCurrentImageButton, &QPushButton::clicked, this, [this] {
-        full_dataset_mode_ = false;
-        loadCurrentImageSpots(current_image_);
-        rebuildGL();
-    });
-
-    connect(centerOriginButton, &QPushButton::clicked,
-            glView_, &ReciprocalSpaceGLView::resetTarget);
-
-    // Reuse the existing helper-window zoom signal. For full-dataset mode we will
-    // later want image-number-aware picking, but current image mode can use this now.
-    connect(glView_, &ReciprocalSpaceGLView::spotDoubleClicked,
-            this, &JFJochHelperWindow::zoom);
-
-    rebuildGL();
-}
-
-// ---------------------------------------------------------------------------
-// Public slots
-// ---------------------------------------------------------------------------
-
-void JFJochViewerReciprocalSpaceWindow::datasetLoaded(
-        std::shared_ptr<const JFJochReaderDataset> in_dataset)
-{
-    current_dataset_ = std::move(in_dataset);
-    current_image_.reset();
-
-    spots_.clear();
-    reflections_.clear();
-    indexed_lattice_.reset();
-    current_back_rot_.reset();
-    full_dataset_mode_ = false;
-    has_rotation_ = false;
-
-    if (current_dataset_)
-        has_rotation_ = current_dataset_->experiment.GetGoniometer().has_value();
-
-    crystalFrameCheck->setEnabled(has_rotation_);
-    if (!has_rotation_)
-        crystalFrameCheck->setChecked(false);
-
-    rebuildGL();
-}
-
-void JFJochViewerReciprocalSpaceWindow::imageLoaded(std::shared_ptr<const JFJochReaderImage> image) {
-    current_image_ = std::move(image);
-
-    // In full-dataset mode, normal image updates should not replace the range view.
-    if (full_dataset_mode_)
-        return;
-
-    // Closed: skip extracting this frame's spots as well, not just the GL rebuild.
-    if (!isVisible()) {
-        pending_rebuild_ = true;
-        return;
-    }
-
-    loadCurrentImageSpots(current_image_);
-    rebuildGL();
-}
-
-void JFJochViewerReciprocalSpaceWindow::loadCurrentImageSpots(
-        std::shared_ptr<const JFJochReaderImage> image)
-{
-    spots_.clear();
-    reflections_.clear();
-    indexed_lattice_.reset();
-    current_back_rot_.reset();
-
-    if (!image)
-        return;
-
-    current_dataset_ = std::shared_ptr<const JFJochReaderDataset>(
-        image,
-        &image->Dataset()
-    );
-
-    const auto &dataset        = image->Dataset();
-    const auto  geom           = dataset.experiment.GetDiffractionGeometry();
-    const auto  axis           = dataset.experiment.GetGoniometer();
-    const int64_t image_number = image->ImageData().number;
-
-    if (axis) {
-        const float angle_deg = axis->GetAngle_deg(static_cast<float>(image_number))
-                                + axis->GetWedge_deg() / 2.0f;
-        current_back_rot_ = axis->GetTransformationAngle(angle_deg);
-    }
-
-    spots_.reserve(image->ImageData().spots.size());
-
-    for (const auto &s : image->ImageData().spots)
-        addSpot(s, geom, axis, image_number);
-
-    reflections_.reserve(image->ImageData().reflections.size());
-    for (const auto &r : image->ImageData().reflections) {
-        reflections_.push_back({
-            .h = r.h,
-            .k = r.k,
-            .l = r.l,
-            .image_x = r.predicted_x,
-            .image_y = r.predicted_y
-        });
-    }
-
-    if (image->ImageData().indexing_lattice)
-        indexed_lattice_ = image->ImageData().indexing_lattice;
-}
-
-void JFJochViewerReciprocalSpaceWindow::addSpot(const SpotToSave &s, const DiffractionGeometry &geom,
-                                                const std::optional<GoniometerAxis> &axis, int64_t image_number) {
-    std::optional<RotMatrix> back_rot;
-    if (axis) {
-        const float angle_deg = axis->GetAngle_deg(static_cast<float>(image_number))
-                                + axis->GetWedge_deg() / 2.0f;
-        back_rot = axis->GetTransformationAngle(angle_deg);
-    }
-
-    CurrentSpot spot;
-    spot.recip_lab     = s.ReciprocalCoord(geom);
-    spot.recip_crystal = back_rot ? (*back_rot * spot.recip_lab) : spot.recip_lab;
-    spot.image_x       = s.x;
-    spot.image_y       = s.y;
-    spot.image_number  = image_number;
-    spot.h             = static_cast<int32_t>(s.h);
-    spot.k             = static_cast<int32_t>(s.k);
-    spot.l             = static_cast<int32_t>(s.l);
-    spot.indexed       = s.indexed;
-    spot.ice_ring      = s.ice_ring;
-
-    spots_.emplace_back(spot);
-}
-
-void JFJochViewerReciprocalSpaceWindow::spotsLoaded(std::shared_ptr<const JFJochReaderSpots> reader_spots) {
-    if (!reader_spots || !current_dataset_)
-        return;
-
-    full_dataset_mode_ = true;
-
-    spots_.clear();
-    reflections_.clear();
-    current_back_rot_.reset();
-
-    const auto geom = current_dataset_->experiment.GetDiffractionGeometry();
-    const auto axis = current_dataset_->experiment.GetGoniometer();
-
-    size_t total_spots = 0;
-    for (const auto &image_spots : reader_spots->spots)
-        total_spots += image_spots.size();
-
-    spots_.reserve(total_spots);
-
-    for (size_t image_index = 0; image_index < reader_spots->spots.size(); ++image_index) {
-        const int64_t image_number = reader_spots->start_image + image_index * reader_spots->stride;
-
-        for (const auto &s : reader_spots->spots[image_index])
-            addSpot(s, geom, axis, image_number);
-    }
-
-    // Keep the cell vectors from the currently visible image if available.
-    // Later we can improve this by reading/choosing a representative lattice for the range.
-    if (current_image_ && current_image_->ImageData().indexing_lattice)
-        indexed_lattice_ = current_image_->ImageData().indexing_lattice;
-
-    rebuildGL();
-}
-
-void JFJochViewerReciprocalSpaceWindow::setSpotColor(QColor input) {
-    if (!input.isValid())
-        return;
-
-    spot_color = input;
-    rebuildGL();
-}
-
-void JFJochViewerReciprocalSpaceWindow::setFeatureColor(QColor input) {
-    if (!input.isValid())
-        return;
-
-    indexed_color = input;
-    rebuildGL();
-}
-
-void JFJochViewerReciprocalSpaceWindow::setPredictionColor(QColor input) {
-    if (!input.isValid())
-        return;
-
-    prediction_color = input;
-    rebuildGL();
-}
-
-// ---------------------------------------------------------------------------
-// Private
-// ---------------------------------------------------------------------------
-
-QColor JFJochViewerReciprocalSpaceWindow::spotColorFor(bool indexed,
-                                                        bool ice_ring) const {
-    if (indexed)
-        return indexed_color;
-    if (ice_ring)
-        return ice_ring_color;
-    return spot_color;
-}
-
-void JFJochViewerReciprocalSpaceWindow::rebuildGL() {
-    // The reciprocal-space view is a gadget that is closed almost all of the time. Building the
-    // vertex arrays and pushing them to the GL view is real work on every frame, and nobody is
-    // looking at the result, so note that a rebuild is owed and do it when the window is shown.
-    if (!isVisible()) {
-        pending_rebuild_ = true;
-        return;
-    }
-    pending_rebuild_ = false;
-    rebuildGLNow();
-}
-
-void JFJochViewerReciprocalSpaceWindow::showEvent(QShowEvent *event) {
-    JFJochHelperWindow::showEvent(event);
-    if (!pending_rebuild_)
-        return;
-    pending_rebuild_ = false;
-    // Spots for the current frame were not extracted while the window was closed either.
-    if (!full_dataset_mode_)
-        loadCurrentImageSpots(current_image_);
-    rebuildGLNow();
-}
-
-void JFJochViewerReciprocalSpaceWindow::rebuildGLNow() {
-    const bool crystal_frame = crystalFrameCheck->isChecked() && has_rotation_;
-
-    std::optional<CrystalLattice> plot_lattice;
-    if (indexed_lattice_) {
-        plot_lattice = indexed_lattice_.value();
-
-        // If spots are brought back to angle zero, bring the lattice back too.
-        // After this, q = h*Astar + k*Bstar + l*Cstar is in the same frame as the plotted spots.
-        if (crystal_frame && current_back_rot_)
-            plot_lattice = plot_lattice->Multiply(*current_back_rot_);
-    }
-
-    // --- Spots ---------------------------------------------------------------
-    std::vector<ReciprocalSpaceGLView::Vertex> spotVerts;
-    spotVerts.reserve(spots_.size() + 1);
-
-    auto toF = [](const QColor &c, float &r, float &g, float &b) {
-        r = float(c.redF());
-        g = float(c.greenF());
-        b = float(c.blueF());
-    };
-
-    float sr, sg, sb;
-    float ir, ig, ib;
-    float xr, xg, xb;
-    float pr, pg, pb;
-
-    toF(spot_color,       sr, sg, sb);
-    toF(indexed_color,    ir, ig, ib);
-    toF(ice_ring_color,   xr, xg, xb);
-    toF(prediction_color, pr, pg, pb);
-
-    for (const auto &spot : spots_) {
-        const Coord &c = crystal_frame ? spot.recip_crystal : spot.recip_lab;
-
-        float r, g, b;
-        if (spot.indexed) {
-            r = ir;
-            g = ig;
-            b = ib;
-        } else if (spot.ice_ring) {
-            r = xr;
-            g = xg;
-            b = xb;
-        } else {
-            r = sr;
-            g = sg;
-            b = sb;
-        }
-
-        spotVerts.push_back({
-            c.x * scene_scale_,
-            c.y * scene_scale_,
-            c.z * scene_scale_,
-            r, g, b, 1.0f,
-            spot.image_x,
-            spot.image_y,
-            static_cast<float>(spot.image_number),
-            1.0f
-        });
-    }
-
-    // Explicit 000 reflection marker.
-    spotVerts.push_back({
-        0.0f, 0.0f, 0.0f,
-        1.0f, 1.0f, 1.0f, 1.0f,
-        0.0f, 0.0f,
-        -1.0f,
-        0.0f
-    });
-
-    if (showPredictedCheck->isChecked() && plot_lattice) {
-        const Coord a = plot_lattice->Astar();
-        const Coord b = plot_lattice->Bstar();
-        const Coord c = plot_lattice->Cstar();
-
-        for (const auto &r : reflections_) {
-            bool observedIndexed = false;
-            for (const auto &spot : spots_) {
-                if (spot.indexed && spot.h == r.h && spot.k == r.k && spot.l == r.l) {
-                    observedIndexed = true;
-                    break;
-                }
-            }
-
-            if (observedIndexed)
-                continue;
-
-            const Coord node{
-                r.h * a.x + r.k * b.x + r.l * c.x,
-                r.h * a.y + r.k * b.y + r.l * c.y,
-                r.h * a.z + r.k * b.z + r.l * c.z
-            };
-
-            // Highlight nodes that are actual predictions for this image.
-            spotVerts.push_back({
-                node.x * scene_scale_,
-                node.y * scene_scale_,
-                node.z * scene_scale_,
-                pr, pg, pb, 0.80f,
-                r.image_x, r.image_y,
-                -1.0f,
-                1.0f
-            });
-        }
-    }
-
-
-    // --- Lines: axes + optional cell vectors ---------------------------------
-    std::vector<ReciprocalSpaceGLView::Vertex> lineVerts;
-
-    auto addLine = [&](QVector3D a, QVector3D b, QColor col, float alpha = 1.0f) {
-        const float r  = float(col.redF());
-        const float g  = float(col.greenF());
-        const float bv = float(col.blueF());
-
-        lineVerts.push_back({
-            a.x(), a.y(), a.z(),
-            r, g, bv, alpha,
-            0.0f, 0.0f,
-            -1.0f, 0.0f,
-        });
-
-        lineVerts.push_back({
-            b.x(), b.y(), b.z(),
-            r, g, bv, alpha,
-            0.0f, 0.0f,
-            -1.0f, 0.0f
-        });
-    };
-
-    // Reference coordinate axes: short and white.
-    const float len = 20.0f;
-    addLine({0, 0, 0}, {len, 0, 0}, Qt::white, 0.75f);
-    addLine({0, 0, 0}, {0, len, 0}, Qt::white, 0.75f);
-    addLine({0, 0, 0}, {0, 0, len}, Qt::white, 0.75f);
-
-    // Reciprocal cell vectors, using the same plotted lattice frame as predicted nodes.
-    if (showCellCheck->isChecked() && plot_lattice) {
-        auto addCell = [&](const Coord &v, QColor col) {
-            addLine({0, 0, 0},
-                    {
-                        v.x * scene_scale_,
-                        v.y * scene_scale_,
-                        v.z * scene_scale_
-                    },
-                    col,
-                    1.0f);
-        };
-
-        addCell(plot_lattice->Astar(), Qt::red);
-        addCell(plot_lattice->Bstar(), Qt::green);
-        addCell(plot_lattice->Cstar(), Qt::blue);
-    }
-
-    glView_->setSpots(spotVerts);
-    glView_->setLines(lineVerts);
-}
\ No newline at end of file
diff --git a/viewer/windows/JFJochViewerReciprocalSpaceWindow.h b/viewer/windows/JFJochViewerReciprocalSpaceWindow.h
deleted file mode 100644
index 22a3d6192..000000000
--- a/viewer/windows/JFJochViewerReciprocalSpaceWindow.h
+++ /dev/null
@@ -1,182 +0,0 @@
-// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
-// SPDX-License-Identifier: GPL-3.0-only
-
-#pragma once
-
-#include <QMainWindow>
-#include <QCheckBox>
-#include <QOpenGLWidget>
-#include <QOpenGLFunctions_3_3_Core>
-#include <QOpenGLShaderProgram>
-#include <QOpenGLBuffer>
-#include <QOpenGLVertexArrayObject>
-#include <QMatrix4x4>
-#include <QComboBox>
-#include <QMouseEvent>
-#include <QWheelEvent>
-
-#include <vector>
-#include <memory>
-#include <optional>
-
-#include "JFJochHelperWindow.h"           // your existing base class
-#include "../../common/CrystalLattice.h"  // Coord, RotMatrix, etc.
-#include "../../common/SpotToSave.h"
-#include "../../common/DiffractionGeometry.h"
-#include "../../common/GoniometerAxis.h"
-
-// Forward declarations from your codebase
-struct JFJochReaderDataset;
-class JFJochReaderImage;
-struct JFJochReaderSpots;
-
-// ---------------------------------------------------------------------------
-// ReciprocalSpaceGLView  –  the actual OpenGL viewport
-// ---------------------------------------------------------------------------
-class ReciprocalSpaceGLView : public QOpenGLWidget,
-                               protected QOpenGLFunctions_3_3_Core {
-    Q_OBJECT
-public:
-    explicit ReciprocalSpaceGLView(QWidget *parent = nullptr);
-    ~ReciprocalSpaceGLView() override;
-
-    struct Vertex {
-        float x, y, z;
-        float r, g, b, a;
-        float image_x = 0.0f;
-        float image_y = 0.0f;
-        float image_number = -1.0f;
-        float pickable = 0.0f;
-    };
-
-    void resetTarget();
-
-    // Called by the outer window whenever data changes.
-    void setSpots(const std::vector<Vertex> &spots);
-    void setLines(const std::vector<Vertex> &lines);   // axes + cell vectors
-
-signals:
-    void spotDoubleClicked(QPointF imagePos);
-
-protected:
-    void initializeGL() override;
-    void resizeGL(int w, int h) override;
-    void paintGL() override;
-
-    void mousePressEvent(QMouseEvent *e) override;
-    void mouseDoubleClickEvent(QMouseEvent *e) override;
-    void mouseMoveEvent(QMouseEvent *e) override;
-    void wheelEvent(QWheelEvent *e) override;
-
-private:
-    void uploadBuffer(QOpenGLBuffer &vbo, QOpenGLVertexArrayObject &vao,
-                      const std::vector<Vertex> &data);
-    void setupVAO(QOpenGLVertexArrayObject &vao, QOpenGLBuffer &vbo);
-
-    QMatrix4x4 currentViewMatrix() const;
-    QMatrix4x4 currentMvpMatrix() const;
-    bool emitNearestSpot(const QPoint &screenPos);
-
-    QOpenGLShaderProgram shader_;
-    bool                 glReady_ = false;
-
-    QOpenGLVertexArrayObject spotsVAO_;
-    QOpenGLBuffer            spotsVBO_;
-    int                      spotsCount_ = 0;
-    std::vector<Vertex>      pendingSpots_;
-
-    QOpenGLVertexArrayObject linesVAO_;
-    QOpenGLBuffer            linesVBO_;
-    int                      linesCount_ = 0;
-    std::vector<Vertex>      pendingLines_;
-
-    // Camera state
-    QMatrix4x4  proj_;
-    float       yaw_   = 0.0f;   // degrees
-    float       pitch_ = 20.0f;  // degrees
-    float       zoom_  = 80.0f;  // distance from camera target
-    QVector3D   target_{0.0f, 0.0f, 0.0f};
-    QPoint      lastMousePos_;
-};
-
-// ---------------------------------------------------------------------------
-// JFJochViewerReciprocalSpaceWindow  –  the outer QMainWindow
-// ---------------------------------------------------------------------------
-
-class JFJochViewerReciprocalSpaceWindow : public JFJochHelperWindow {
-    Q_OBJECT
-public:
-    explicit JFJochViewerReciprocalSpaceWindow(QWidget *parent = nullptr);
-
-signals:
-    void loadSpotsRequest(int64_t start_image, int64_t end_image, int64_t stride);
-
-public slots:
-    void datasetLoaded(std::shared_ptr<const JFJochReaderDataset> dataset);
-    void imageLoaded(std::shared_ptr<const JFJochReaderImage> image);
-    void spotsLoaded(std::shared_ptr<const JFJochReaderSpots> spots);
-    void setSpotColor(QColor color);
-    void setFeatureColor(QColor color);
-    void setPredictionColor(QColor color);
-
-private:
-    struct CurrentSpot {
-        Coord recip_lab;
-        Coord recip_crystal;
-        float image_x = 0.0f;
-        float image_y = 0.0f;
-        int64_t image_number = -1;
-        int32_t h = 0;
-        int32_t k = 0;
-        int32_t l = 0;
-        bool  indexed  = false;
-        bool  ice_ring = false;
-    };
-
-    struct CurrentReflection {
-        int32_t h = 0;
-        int32_t k = 0;
-        int32_t l = 0;
-        float image_x = 0.0f;
-        float image_y = 0.0f;
-        int64_t image_number = -1;
-    };
-
-    QColor spotColorFor(bool indexed, bool ice_ring) const;
-    // rebuildGL() is a no-op while the window is closed - it only records that a rebuild is
-    // owed, and showEvent() pays it. rebuildGLNow() is the actual work.
-    void   rebuildGL();   // rebuilds both spot and line vertex data
-    void   rebuildGLNow();
-    void   showEvent(QShowEvent *event) override;
-    bool   pending_rebuild_ = false;
-    void   loadCurrentImageSpots(std::shared_ptr<const JFJochReaderImage> image);
-    void   addSpot(const SpotToSave &s,
-                   const DiffractionGeometry &geom,
-                   const std::optional<GoniometerAxis> &axis,
-                   int64_t image_number);
-
-    // UI
-    ReciprocalSpaceGLView *glView_            = nullptr;
-    QCheckBox             *crystalFrameCheck  = nullptr;
-    QCheckBox             *showCellCheck      = nullptr;
-    QCheckBox             *showPredictedCheck = nullptr;
-    QComboBox             *strideCombo        = nullptr;
-
-    // Data
-    std::shared_ptr<const JFJochReaderDataset> current_dataset_;
-    std::shared_ptr<const JFJochReaderImage>   current_image_;
-
-    std::vector<CurrentSpot>        spots_;
-    std::vector<CurrentReflection>  reflections_;
-    std::optional<CrystalLattice>   indexed_lattice_;
-    std::optional<RotMatrix>        current_back_rot_;
-    bool   has_rotation_ = false;
-    bool   full_dataset_mode_ = false;
-    float  scene_scale_  = 100.0f;
-
-    // Colors
-    QColor spot_color = Qt::green;
-    QColor indexed_color = Qt::magenta;   // feature_color in image
-    QColor prediction_color = Qt::darkRed;
-    QColor ice_ring_color = Qt::cyan;
-};
diff --git a/writer/HDF5DataFile.cpp b/writer/HDF5DataFile.cpp
index 79e03f706..1c47c12c8 100644
--- a/writer/HDF5DataFile.cpp
+++ b/writer/HDF5DataFile.cpp
@@ -45,7 +45,7 @@ declared_pixel_signed(msg.pixel_signed) {
     exptime.reserve(images_per_file);
     number.reserve(images_per_file);
 
-    uint64_t tmp_suffix;
+    uint64_t tmp_suffix = std::chrono::system_clock::now().time_since_epoch().count();
     try {
         if (!msg.arm_date.empty())
             tmp_suffix = parse_UTC_to_ms(msg.arm_date);
diff --git a/writer/HDF5NXmx.cpp b/writer/HDF5NXmx.cpp
index c37e745b0..5416cb5e8 100644
--- a/writer/HDF5NXmx.cpp
+++ b/writer/HDF5NXmx.cpp
@@ -23,7 +23,7 @@ std::string HDF5Metadata::MasterFileName(const StartMessage &start) {
 NXmx::NXmx(const StartMessage &start)
         : start_message(start),
           filename(HDF5Metadata::MasterFileName(start)) {
-    uint64_t tmp_suffix;
+    uint64_t tmp_suffix = std::chrono::system_clock::now().time_since_epoch().count();
     try {
         if (!start.arm_date.empty())
             tmp_suffix = parse_UTC_to_ms(start.arm_date);
@@ -1285,4 +1285,10 @@ void NXmx::EndResultVectors(const EndMessage &end) {
         if (!hdf5_file->Exists("/entry/MX/sweepQualityReasons"))
             hdf5_file->SaveVector("/entry/MX/sweepQualityReasons", end.sweep_quality_reasons);
     }
+    // Per-image disposition, same shape: frameDisposition[i] indexes frameDispositionCodes from 0.
+    if (!end.frame_disposition.empty() && !end.frame_disposition_codes.empty()) {
+        SaveVectorIfMissing(*hdf5_file, "/entry/MX/frameDisposition", end.frame_disposition);
+        if (!hdf5_file->Exists("/entry/MX/frameDispositionCodes"))
+            hdf5_file->SaveVector("/entry/MX/frameDispositionCodes", end.frame_disposition_codes);
+    }
 }
diff --git a/xds-plugin/CMakeLists.txt b/xds-plugin/CMakeLists.txt
index 8f2540433..7bad18ec2 100644
--- a/xds-plugin/CMakeLists.txt
+++ b/xds-plugin/CMakeLists.txt
@@ -3,10 +3,6 @@ ADD_LIBRARY(jfjoch_xds_plugin SHARED plugin.cpp plugin.h)
 TARGET_LINK_LIBRARIES(jfjoch_xds_plugin JFJochHDF5Wrappers JFJochVersion Compression hdf5-static)
 INSTALL(TARGETS jfjoch_xds_plugin DESTINATION ${CMAKE_INSTALL_LIBDIR}/jfjoch COMPONENT viewer)
 
-target_link_options(jfjoch_xds_plugin PRIVATE
-        "LINKER:--exclude-libs,ALL"
-)
-
 set_target_properties(jfjoch_xds_plugin PROPERTIES
         CXX_VISIBILITY_PRESET hidden
         C_VISIBILITY_PRESET hidden