From ae303754587d23dd29ea78595a9860d4ee1b7c84 Mon Sep 17 00:00:00 2001
From: Jon Wright <wright@esrf.fr>
Date: Fri, 26 Jun 2026 08:45:23 +0000
Subject: [PATCH] Fix misori_tetragonal identity bug and add c2ImageD11
 cross-test CI

misori_tetragonal: the trace comparison was checking m2 > m3 (off-diagonal
vs c-axis) instead of m1 > m2 (diagonal vs off-diagonal), causing the
identity case to return 1 instead of 3.

This matches the fix already applied in c2ImageD11 0.3.0.

Also noted: refine_assigned infinite-loop bug (i++ instead of j++) was
already fixed in commit acb51d5.

CI: add a workflow that builds c2ImageD11 from git head (using their
checked-in pre-generated wrappers, no c2py23 dependency) and runs the
full ImageD11 test suite with IMAGED11_USE_C2=1, so we break when
upstream changes break our compatibility.
---
 .github/workflows/c2ImageD11_cross_test.yml | 68 +++++++++++++++++++++
 src/closest.c                               |  2 +-
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/c2ImageD11_cross_test.yml

diff --git a/.github/workflows/c2ImageD11_cross_test.yml b/.github/workflows/c2ImageD11_cross_test.yml
new file mode 100644
index 00000000..d7b415bc
--- /dev/null
+++ b/.github/workflows/c2ImageD11_cross_test.yml
@@ -0,0 +1,68 @@
+# Cross-test against c2ImageD11 git head.
+#
+# Builds c2ImageD11 from source (meson+ninja) using the pre-generated
+# wrappers checked into c2ImageD11's repo — no c2py23 dependency.
+# Then runs the full ImageD11 test suite with IMAGED11_USE_C2=1 so we
+# break if an upstream change in c2ImageD11 makes our tests fail.
+#
+# This is the mirror of c2ImageD11's own CI which installs ImageD11 from
+# PyPI. Here we install c2ImageD11 from git head and test our own checkout.
+
+name: c2ImageD11 cross-test
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build-c2-and-test:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: imaged11
+
+      - name: Checkout c2ImageD11 git head
+        uses: actions/checkout@v4
+        with:
+          repository: jonwright/c2ImageD11
+          path: c2ImageD11
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install build deps for c2ImageD11
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install meson ninja numpy
+
+      - name: Build c2ImageD11 .so with meson (checked-in wrappers, no c2py23)
+        run: |
+          mkdir -p c2ImageD11/build/libc2ImageD11
+          cd c2ImageD11/build/libc2ImageD11
+          meson setup ../../lib
+          ninja
+          arch=$(python -c "import platform; print(platform.machine())")
+          cp _cImageD11.so ../../c2ImageD11/_cImageD11_${arch}.so
+
+      - name: Install c2ImageD11
+        run: |
+          cd c2ImageD11 && python -m pip install .
+
+      - name: Install ImageD11 and test deps
+        run: |
+          python -m pip install numpy pytest numba fabio pyFAI xfab diffpy.Structure scipy orix
+          cd imaged11 && python -m pip install -e .
+
+      - name: Test with IMAGED11_USE_C2=1
+        run: |
+          cd imaged11/test
+          IMAGED11_USE_C2=1 python -m pytest -v --ignore=test_columnfile_pandas.py
diff --git a/src/closest.c b/src/closest.c
index 075bccf7..5f713921 100644
--- a/src/closest.c
+++ b/src/closest.c
@@ -828,7 +828,7 @@ double misori_tetragonal(vec u1[3], vec u2[3]) {
     }
     m1 = fabs(r[0][0]) + fabs(r[1][1]);
     m2 = fabs(r[1][0]) + fabs(r[0][1]);
-    if (m2 > m3) {
+    if (m1 > m2) {
         return m1 + m3;
     } else {
         return m2 + m3;